TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Use tdeApp

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/89/head
Michele Calgaro 2 months ago
parent f491bbc527
commit fdde1e4ac2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
122 changed files with 285 additions and 285 deletions
Show Stats Download Patch File Download Diff File

4
chalk/core/kis_image_iface.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ DCOPRef KisImageIface::activeDevice()
if( !dev )
return DCOPRef();
else
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
dev->dcopObject()->objId(),
"KisPaintDeviceIface");
@ -91,7 +91,7 @@ DCOPRef KisImageIface::colorSpace() const
if ( !cs )
return DCOPRef();
else
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
cs->dcopObject()->objId(),
"KisColorSpaceIface" );
}

2
chalk/core/kis_paint_device_iface.cpp
Unescape Escape View File

@ -62,7 +62,7 @@ DCOPRef KisPaintDeviceIface::colorSpace() const
if ( !cs )
return DCOPRef();
else
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
cs->dcopObject()->objId(),
"KisColorSpaceIface" );
}

4
chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
Unescape Escape View File

@ -129,9 +129,9 @@ void KisToolZoom::deactivate()
void KisToolZoom::slotTimer()
{
#if KDE_IS_VERSION(3,4,0)
int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
#else
int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
|TDEApplication::ControlModifier|TDEApplication::Modifier1);
#endif

4
chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
Unescape Escape View File

@ -166,9 +166,9 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e)
void KisToolSelectSimilar::slotTimer()
{
#if KDE_IS_VERSION(3,4,0)
int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
#else
int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
|TDEApplication::ControlModifier|TDEApplication::Modifier1);
#endif
enumSelectionMode action;

2
chalk/ui/kis_doc.cpp
Unescape Escape View File

@ -1120,7 +1120,7 @@ void KisDoc::IODone()
void KisDoc::slotIOProgress(TQ_INT8 percentage)
{
TDEApplication *app = TDEApplication::kApplication();
TDEApplication *app = tdeApp;
Q_ASSERT(app);

2
chalk/ui/kis_doc_iface.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ DCOPRef KisDocIface::currentImage()
if( !img )
return DCOPRef();
else
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
img->dcopObject()->objId(),
"KisImageIface");
}

4
chalk/ui/kis_label_progress.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ void KisLabelProgress::update(int percent)
{
m_bar->setValue(percent);
TDEApplication *app = TDEApplication::kApplication();
TDEApplication *app = tdeApp;
app->processEvents();
// The following is safer, but makes cancel impossible:
@ -181,7 +181,7 @@ void KisLabelProgress::updateStage(const TQString&, int percent)
{
m_bar->setValue(percent);
TDEApplication *app = TDEApplication::kApplication();
TDEApplication *app = tdeApp;
Q_ASSERT(app);
app->processEvents();

2
doc/chalk/installation.docbook
Unescape Escape View File

@ -1,7 +1,7 @@
<appendix id="installation">
<title>Installation</title>
<sect1 id="getting-kapp">
<sect1 id="getting-tdeApp">
<title>How to obtain &chalk;</title>
<!-- This first entity contains boiler plate for applications that are

6
filters/chalk/gmagick/kis_image_magick_converter.cpp
Unescape Escape View File

@ -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);

2
filters/chalk/jpeg/kis_jpeg_export.cpp
Unescape Escape View File

@ -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 :(

6
filters/chalk/magick/kis_image_magick_converter.cpp
Unescape Escape View File

@ -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);

2
filters/chalk/pdf/kis_pdf_import.cpp
Unescape Escape View File

@ -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;

2
filters/chalk/png/kis_png_export.cpp
Unescape Escape View File

@ -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 :(

2
filters/chalk/tiff/kis_dlg_options_tiff.cpp
Unescape Escape View File

@ -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) );
}

2
filters/kformula/latex/latexexport.cpp
Unescape Escape View File

@ -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();

2
filters/kformula/mathml/mathmlexport.cpp
Unescape Escape View File

@ -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();

2
filters/kformula/mathml/mathmlimport.cpp
Unescape Escape View File

@ -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();

4
filters/kformula/png/pngexport.cpp
Unescape Escape View File

@ -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;
}

4
filters/kformula/png/pngexportdia.cpp
Unescape Escape View File

@ -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();

2
filters/kformula/svg/svgexport.cpp
Unescape Escape View File

@ -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();

2
filters/kivio/imageexport/kivio_imageexportdialog.cpp
Unescape Escape View File

@ -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);
}

12
filters/kspread/csv/csvdialog.cpp
Unescape Escape View File

@ -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()

8
filters/kspread/csv/csvexportdialog.cpp
Unescape Escape View File

@ -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);

4
filters/kspread/html/exportdialog.cpp
Unescape Escape View File

@ -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

2
filters/kspread/latex/export/formula.cpp
Unescape Escape View File

@ -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 ) ) {

8
filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
Unescape Escape View File

@ -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

4
filters/kword/ascii/ExportDialog.cpp
Unescape Escape View File

@ -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

4
filters/kword/ascii/ImportDialog.cpp
Unescape Escape View File

@ -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

4
filters/kword/html/export/ExportDialog.cpp
Unescape Escape View File

@ -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 )

2
filters/kword/latex/export/formula.cpp
Unescape Escape View File

@ -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 );

8
filters/kword/latex/export/kwordlatexexportdia.cpp
Unescape Escape View File

@ -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

8
filters/kword/latex/import/lateximportdia.cpp
Unescape Escape View File

@ -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());
}
}

4
filters/kword/mswrite/ImportDialog.cpp
Unescape Escape View File

@ -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

2
filters/libdialogfilter/exportsizedia.cpp
Unescape Escape View File

@ -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();

2
filters/xsltfilter/export/xsltexportdia.cpp
Unescape Escape View File

@ -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");

4
filters/xsltfilter/import/xsltimportdia.cpp
Unescape Escape View File

@ -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;

2
karbon/core/vgroup_iface.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ VGroupIface::objects()
TQValueList<DCOPRef> lst;
VObjectListIterator itr = m_group->objects();
for( ; itr.current(); ++itr )
lst.append( DCOPRef( kapp->dcopClient()->appId(), itr.current()->dcopObject()->objId() ) );
lst.append( DCOPRef( tdeApp->dcopClient()->appId(), itr.current()->dcopObject()->objId() ) );
return lst;
}

2
karbon/core/vobject_iface.cpp
Unescape Escape View File

@ -46,6 +46,6 @@ VObjectIface::parent() const
if( !m_object->parent() )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
}

2
karbon/karbon_part_iface.cpp
Unescape Escape View File

@ -113,7 +113,7 @@ DCOPRef KarbonPartIface::activeLayer()
if( !m_part->document().activeLayer() )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_part->document().activeLayer()->dcopObject()->objId() );
}

8
kchart/csvimportdialog.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
m_codec( TQTextCodec::codecForName( "UTF-8" ) )
{
setCaption( i18n( "Import Data" ) );
kapp->restoreOverrideCursor();
tdeApp->restoreOverrideCursor();
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@ -111,7 +111,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
CSVImportDialog::~CSVImportDialog()
{
kapp->setOverrideCursor(TQt::waitCursor);
tdeApp->setOverrideCursor(TQt::waitCursor);
}
@ -176,7 +176,7 @@ void CSVImportDialog::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)
@ -385,7 +385,7 @@ void CSVImportDialog::fillTable( )
}
fillComboBox();
kapp->restoreOverrideCursor();
tdeApp->restoreOverrideCursor();
}
void CSVImportDialog::fillComboBox()

2
kexi/core/kexipartmanager.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ Manager::Manager(TQObject *parent)
m_lookupDone = false;
m_partlist.setAutoDelete(true);
m_partsByMime.setAutoDelete(false);
m_parts.setAutoDelete(false);//KApp will remove parts
m_parts.setAutoDelete(false);//TDEApp will remove parts
m_nextTempProjectPartID = -1;
}

4
kexi/core/kexitemplateloader.cpp
Unescape Escape View File

@ -33,9 +33,9 @@
KexiTemplateInfo::List KexiTemplateLoader::loadListInfo()
{
KexiTemplateInfo::List list;
const TQString subdir = TQString(kapp->instanceName()) + "/templates";
const TQString subdir = TQString(tdeApp->instanceName()) + "/templates";
TQString lang( TDEGlobal::locale()->language() );
TQStringList dirs( kapp->dirs()->findDirs("data", subdir) );
TQStringList dirs( tdeApp->dirs()->findDirs("data", subdir) );
while (true) {
foreach( TQStringList::ConstIterator, it, dirs) {
TQDir dir((*it)+lang);

4
kexi/formeditor/formmanager.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
TDEGlobal::locale()->insertCatalogue("kformdesigner");
#endif
connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
//moved to createWidgetLibrary() m_lib = new WidgetLibrary(this, supportedFactoryGroups);
@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
m_style->setEditable(false);
TDEGlobal::config()->setGroup("General");
TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower();
TQString currentStyle = TQString::fromLatin1(tdeApp->style().name()).lower();
const TQStringList styles = TQStyleFactory::keys();
m_style->setItems(styles);
m_style->setCurrentItem(0);

4
kexi/formeditor/test/kfd_mainwindow.cpp
Unescape Escape View File

@ -51,7 +51,7 @@ KFDMainWindow::KFDMainWindow()
else
{
KMessageBox::error(this, i18n("Could not find the KFormDesigner part. Please check your installation."));
kapp->quit();
tdeApp->quit();
return;
}
@ -73,7 +73,7 @@ KFDMainWindow::loadUIFile(const KURL &url)
void
KFDMainWindow::setupActions()
{
KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
}
bool

4
kexi/kexiutils/utils.cpp
Unescape Escape View File

@ -63,11 +63,11 @@ void DelayedCursorHandler::show() {
DelayedCursorHandler _delayedCursorHandler;
void KexiUtils::setWaitCursor(bool noDelay) {
if (kapp->guiEnabled())
if (tdeApp->guiEnabled())
_delayedCursorHandler.start(noDelay);
}
void KexiUtils::removeWaitCursor() {
if (kapp->guiEnabled())
if (tdeApp->guiEnabled())
_delayedCursorHandler.stop();
}

10
kexi/main/keximainwindowimpl.cpp
Unescape Escape View File

@ -239,7 +239,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
if(userMode())
kdDebug() << "KexiMainWindowImpl::KexiMainWindowImpl(): starting up in the User Mode" << endl;
d->config = kapp->config();
d->config = tdeApp->config();
if ( !initialGeometrySet() ) {
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
@ -2174,7 +2174,7 @@ KexiMainWindowImpl::restoreWindowConfiguration(TDEConfig *config)
TQString dockGrp;
if (kapp->isRestored())
if (tdeApp->isRestored())
dockGrp=config->group()+"-Docking";
else
dockGrp="MainWindow0-Docking";
@ -2191,7 +2191,7 @@ KexiMainWindowImpl::storeWindowConfiguration(TDEConfig *config)
TQString dockGrp;
#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
if (kapp->sessionSaving())
if (tdeApp->sessionSaving())
dockGrp=config->group()+"-Docking";
else
#endif
@ -3957,13 +3957,13 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
{
#ifndef KEXI_NO_FEEDBACK_AGENT
#ifdef FEEDBACK_CLASS
const TDEAboutData* about = TDEApplication::kApplication()->aboutData();
const TDEAboutData* about = tdeApp->aboutData();
FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
if ( wizard->exec() )
{
TDEApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
tdeApp->invokeMailer( "kexi-reports-dummy@kexi.org",
TQString(), TQString(),
about->appName() + TQCString( " [feedback]" ),
wizard->feedbackDocument().toString( 2 ).local8Bit() );

8
kexi/main/printing/kexisimpleprintingengine.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ KexiSimplePrintingSettings::KexiSimplePrintingSettings()
addPageNumbers = true;
addDateAndTime = true;
addTableBorders = false;
pageTitleFont = kapp->font();
pageTitleFont = tdeApp->font();
pageTitleFont.setPointSizeFloat( (double)TQFontInfo(pageTitleFont).pointSize()*1.5 );
pageTitleFont.setBold(true);
}
@ -63,7 +63,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
{
KexiSimplePrintingSettings settings; //this will set defaults
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup("Simple Printing");
if (config->hasKey("pageTitleFont"))
settings.pageTitleFont = config->readFontEntry("pageTitleFont");
@ -95,7 +95,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
void KexiSimplePrintingSettings::save()
{
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup("Simple Printing");
config->writeEntry( "pageTitleFont", pageTitleFont );
config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) );
@ -270,7 +270,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
}
//! @todo add setting
m_mainFont = kapp->font();
m_mainFont = tdeApp->font();
if(!printing) {
int pixelSize = int( POINT_TO_INCH(m_mainFont.pointSizeFloat())*m_dpiX )
* m_SCALE;

4
kexi/main/printing/kexisimpleprintpreviewwindow.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
// int constantWidth = m_window->width()- KexiSimplePrintPreviewScrollView_MARGIN*6;
double constantWidth = width()- KexiSimplePrintPreviewScrollView_MARGIN*6;
double heightForWidth = constantWidth * heightMM / widthMM;
// heightForWidth = TQMIN(kapp->desktop()->height()*4/5, heightForWidth);
// heightForWidth = TQMIN(tdeApp->desktop()->height()*4/5, heightForWidth);
kdDebug() << "1: " << heightForWidth << endl;
#if 0 //todo we can use this if we want to fix the height to width of the page
heightForWidth = TQMIN(height(), heightForWidth);
@ -232,7 +232,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
m_navToolbar->addConnection(m_idLast, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLastClicked()));
m_navToolbar->insertSeparator();
resize(width(), kapp->desktop()->height()*4/5);
resize(width(), tdeApp->desktop()->height()*4/5);
//! @todo progress bar...

10
kexi/migration/importoptionsdlg.cpp
Unescape Escape View File

@ -76,8 +76,8 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
lyr->addItem( new TQSpacerItem( 121, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 1, 2 );
//read config
kapp->config()->setGroup("ImportExport");
TQString defaultEncodingForMSAccessFiles = kapp->config()->readEntry("DefaultEncodingForMSAccessFiles");
tdeApp->config()->setGroup("ImportExport");
TQString defaultEncodingForMSAccessFiles = tdeApp->config()->readEntry("DefaultEncodingForMSAccessFiles");
if (!defaultEncodingForMSAccessFiles.isEmpty()) {
m_encodingComboBox->setSelectedEncoding(defaultEncodingForMSAccessFiles);
m_chkAlwaysUseThisEncoding->setChecked(true);
@ -98,12 +98,12 @@ KexiCharacterEncodingComboBox* OptionsDialog::encodingComboBox() const
void OptionsDialog::accept()
{
kapp->config()->setGroup("ImportExport");
tdeApp->config()->setGroup("ImportExport");
if (m_chkAlwaysUseThisEncoding->isChecked())
kapp->config()->writeEntry("defaultEncodingForMSAccessFiles",
tdeApp->config()->writeEntry("defaultEncodingForMSAccessFiles",
m_encodingComboBox->selectedEncoding());
else
kapp->config()->deleteEntry("defaultEncodingForMSAccessFiles");
tdeApp->config()->deleteEntry("defaultEncodingForMSAccessFiles");
KDialogBase::accept();
}

2
kexi/migration/importwizard.cpp
Unescape Escape View File

@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
void ImportWizard::progressUpdated(int percent) {
m_progressBar->setProgress(percent);
TDEApplication::kApplication()->processEvents();
tdeApp->processEvents();
}
//===========================================================

4
kexi/plugins/forms/kexiformpart.cpp
Unescape Escape View File

@ -159,8 +159,8 @@ void KexiFormPart::initPartActions()
void KexiFormPart::initInstanceActions()
{
#ifdef KEXI_DEBUG_GUI
kapp->config()->setGroup("General");
if (kapp->config()->readBoolEntry("showInternalDebugger", false)) {
tdeApp->config()->setGroup("General");
if (tdeApp->config()->readBoolEntry("showInternalDebugger", false)) {
new TDEAction(i18n("Show Form UI Code"), "compfile",
CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()),
actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui");

2
kexi/plugins/forms/widgets/kexidbtextedit.cpp
Unescape Escape View File

@ -97,7 +97,7 @@ void KexiDBTextEdit::setReadOnly( bool readOnly )
{
KTextEdit::setReadOnly( readOnly );
TQPalette p = palette();
TQColor c(readOnly ? lighterGrayBackgroundColor(kapp->palette()) : p.color(TQPalette::Active, TQColorGroup::Base));
TQColor c(readOnly ? lighterGrayBackgroundColor(tdeApp->palette()) : p.color(TQPalette::Active, TQColorGroup::Base));
setPaper( c );
p.setColor(TQColorGroup::Base, c);
p.setColor(TQColorGroup::Background, c);

2
kexi/plugins/importexport/csv/kexicsvexport.cpp
Unescape Escape View File

@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
}
if (copyToClipboard)
kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard);
delete [] isText;
delete [] isDateTime;

16
kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
":CSVImportExport", //startDir
KexiStartupFileDialog::Custom | KexiStartupFileDialog::SavingFileBasedDB,
this, "m_fileSavePage");
m_fileSavePage->setMinimumHeight(kapp->desktop()->height()/2);
m_fileSavePage->setMinimumHeight(tdeApp->desktop()->height()/2);
m_fileSavePage->setAdditionalFilters( csvMimeTypes() );
m_fileSavePage->setDefaultExtension("csv");
m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) );
@ -199,7 +199,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
setFinishEnabled(m_exportOptionsPage, true);
// load settings
kapp->config()->setGroup("ImportExport");
tdeApp->config()->setGroup("ImportExport");
if (m_options.mode!=KexiCSVExport::Clipboard && readBoolEntry("ShowOptionsInCSVExportDialog", false)) {
show();
slotShowOptionsButtonClicked();
@ -301,7 +301,7 @@ void KexiCSVExportWizard::done(int result)
}
//store options
kapp->config()->setGroup("ImportExport");
tdeApp->config()->setGroup("ImportExport");
if (m_options.mode!=KexiCSVExport::Clipboard)
writeEntry("ShowOptionsInCSVExportDialog", m_exportOptionsSection->isVisible());
const bool store = m_alwaysUseCheckBox->isChecked();
@ -387,27 +387,27 @@ static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
bool KexiCSVExportWizard::readBoolEntry(const char *key, bool defaultValue)
{
return kapp->config()->readBoolEntry(convertKey(key, m_options.mode), defaultValue);
return tdeApp->config()->readBoolEntry(convertKey(key, m_options.mode), defaultValue);
}
TQString KexiCSVExportWizard::readEntry(const char *key, const TQString& defaultValue)
{
return kapp->config()->readEntry(convertKey(key, m_options.mode), defaultValue);
return tdeApp->config()->readEntry(convertKey(key, m_options.mode), defaultValue);
}
void KexiCSVExportWizard::writeEntry(const char *key, const TQString& value)
{
kapp->config()->writeEntry(convertKey(key, m_options.mode), value);
tdeApp->config()->writeEntry(convertKey(key, m_options.mode), value);
}
void KexiCSVExportWizard::writeEntry(const char *key, bool value)
{
kapp->config()->writeEntry(convertKey(key, m_options.mode), value);
tdeApp->config()->writeEntry(convertKey(key, m_options.mode), value);
}
void KexiCSVExportWizard::deleteEntry(const char *key)
{
kapp->config()->deleteEntry(convertKey(key, m_options.mode));
tdeApp->config()->deleteEntry(convertKey(key, m_options.mode));
}
TQString KexiCSVExportWizard::defaultDelimiter() const

4
kexi/plugins/importexport/csv/kexicsvexportwizard.h
Unescape Escape View File

@ -70,7 +70,7 @@ class KexiCSVExportWizard : public KWizard
//! \return default text quote depending on mode.
TQString defaultTextQuote() const;
//! Helper, works like kapp->config()->readBoolEntry(const char*, bool) but if mode is Clipboard,
//! Helper, works like tdeApp->config()->readBoolEntry(const char*, bool) but if mode is Clipboard,
//! "Exporting" is replaced with "Copying" and "Export" is replaced with "Copy"
//! and "CSVFiles" is replaced with "CSVToClipboard"
//! in \a key, to keep the setting separate.
@ -79,7 +79,7 @@ class KexiCSVExportWizard : public KWizard
//! Helper like \ref readBoolEntry(const char *, bool), but for TQString values.
TQString readEntry(const char *key, const TQString& defaultValue = TQString());
//! Helper, works like kapp->config()->writeEntry(const char*,bool) but if mode is Clipboard,
//! Helper, works like tdeApp->config()->writeEntry(const char*,bool) but if mode is Clipboard,
//! "Exporting" is replaced with "Copying" and "Export" is replaced with "Copy"
//! and "CSVFiles" is replaced with "CSVToClipboard"
//! in \a key, to keep the setting separate.

6
kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
Unescape Escape View File

@ -181,9 +181,9 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
m_typeNames[3] = i18n("time");
m_typeNames[4] = i18n("date/time");
kapp->config()->setGroup("ImportExport");
m_maximumRowsForPreview = kapp->config()->readNumEntry("MaximumRowsForPreviewInImportDialog", MAX_ROWS_TO_PREVIEW);
m_maximumBytesForPreview = kapp->config()->readNumEntry("MaximumBytesForPreviewInImportDialog", MAX_BYTES_TO_PREVIEW);
tdeApp->config()->setGroup("ImportExport");
m_maximumRowsForPreview = tdeApp->config()->readNumEntry("MaximumRowsForPreviewInImportDialog", MAX_ROWS_TO_PREVIEW);
m_maximumBytesForPreview = tdeApp->config()->readNumEntry("MaximumBytesForPreviewInImportDialog", MAX_BYTES_TO_PREVIEW);
m_pkIcon = SmallIcon("key");

14
kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
Unescape Escape View File

@ -34,8 +34,8 @@
KexiCSVImportOptions::KexiCSVImportOptions()
{
kapp->config()->setGroup("ImportExport");
encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
tdeApp->config()->setGroup("ImportExport");
encoding = tdeApp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
if (encoding.isEmpty()) {
encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
defaultEncodingExplicitySet = false;
@ -44,7 +44,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
defaultEncodingExplicitySet = true;
stripWhiteSpaceInTextValuesChecked
= kapp->config()->readBoolEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", true);
= tdeApp->config()->readBoolEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", true);
}
KexiCSVImportOptions::~KexiCSVImportOptions()
@ -124,14 +124,14 @@ KexiCSVImportOptions KexiCSVImportOptionsDialog::options() const
void KexiCSVImportOptionsDialog::accept()
{
kapp->config()->setGroup("ImportExport");
tdeApp->config()->setGroup("ImportExport");
if (m_chkAlwaysUseThisEncoding->isChecked())
kapp->config()->writeEntry("DefaultEncodingForImportingCSVFiles",
tdeApp->config()->writeEntry("DefaultEncodingForImportingCSVFiles",
m_encodingComboBox->selectedEncoding());
else
kapp->config()->deleteEntry("DefaultEncodingForImportingCSVFiles");
tdeApp->config()->deleteEntry("DefaultEncodingForImportingCSVFiles");
kapp->config()->writeEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles",
tdeApp->config()->writeEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles",
m_chkStripWhiteSpaceInTextValues->isChecked());
KDialogBase::accept();

4
kexi/widget/kexibrowser.cpp
Unescape Escape View File

@ -91,7 +91,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
lyr->addWidget(m_list);
m_list->installEventFilter(this);
m_list->renameLineEdit()->installEventFilter(this);
connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
slotSettingsChanged(0);
m_list->header()->hide();
@ -108,7 +108,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
connect(m_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
TDEConfig *config = kapp->config();
TDEConfig *config = tdeApp->config();
config->setGroup("MainWindow");
if ((m_features & SingleClickOpensItemOptionEnabled)
&& config->readBoolEntry("SingleClickOpensItem", false))

2
kexi/widget/pixmapcollection.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ PixmapCollection::getPixmap(const TQString &name)
if(m_pixmaps[name].second != 0)
{
return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
return tdeApp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
}
else
return TQPixmap(m_pixmaps[name].first);

4
kexi/widget/tableview/kexitableview.cpp
Unescape Escape View File

@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
d = new KexiTableViewPrivate(this);
connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
m_data = new KexiTableViewData(); //to prevent crash because m_data==0
@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
#if 0 //moved to mainwindow's actions
d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
d->menu_id_removeRecord = m_popupMenu->insertItem(
kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
tdeApp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
#endif

2
kformula/formulastring.cpp
Unescape Escape View File

@ -107,7 +107,7 @@ void FormulaString::accept()
void FormulaString::helpButtonClicked()
{
kapp->invokeHelp( "formula-strings", "kformula" );
tdeApp->invokeHelp( "formula-strings", "kformula" );
}
void FormulaString::cursorPositionChanged( int para, int pos )

2
kformula/kformula_doc.cpp
Unescape Escape View File

@ -62,7 +62,7 @@ KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObjec
//kdDebug(39001) << "General Settings" << endl;
history = new KoCommandHistory( actionCollection() );
wrapper = new KFormula::DocumentWrapper( kapp->config(),
wrapper = new KFormula::DocumentWrapper( tdeApp->config(),
actionCollection(),
history );
document = new KFormula::Document;

2
kivio/kiviopart/KIvioDocIface.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ KIvioDocIface::KIvioDocIface( KivioDoc *doc_ )
DCOPRef KIvioDocIface::map()
{
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->map()->dcopObject()->objId() );
}

8
kivio/kiviopart/KIvioMapIface.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ DCOPRef KIvioMapIface::page( const TQString& name )
if ( !t )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
}
DCOPRef KIvioMapIface::pageByIndex( int index )
@ -53,7 +53,7 @@ DCOPRef KIvioMapIface::pageByIndex( int index )
kdDebug(43000) << "+++++++ Returning page " << t->TQObject::name() << endl;
return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
}
int KIvioMapIface::pageCount() const
@ -80,7 +80,7 @@ TQValueList<DCOPRef> KIvioMapIface::pages()
TQPtrList<KivioPage>& lst = m_map->pageList();
TQPtrListIterator<KivioPage> it( lst );
for( ; it.current(); ++it )
t.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
t.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
return t;
}
@ -114,6 +114,6 @@ bool KIvioMapIface::processDynamic(const TQCString &fun, const TQByteArray &/*da
replyType = "DCOPRef";
TQDataStream out( replyData, IO_WriteOnly );
out << DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
out << DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
return true;
}

4
kivio/kiviopart/KIvioPageIface.cpp
Unescape Escape View File

@ -90,7 +90,7 @@ int KIvioPageIface::nbLayer() const
DCOPRef KIvioPageIface::firstLayer()
{
if ( m_page->firstLayer())
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_page->firstLayer()->dcopObject()->objId() );
else
return DCOPRef();
@ -100,7 +100,7 @@ DCOPRef KIvioPageIface::layerAt( int pos)
{
if ( pos >= nbLayer() )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_page->layerAt(pos)->dcopObject()->objId() );
}

2
kivio/kiviopart/kivio_view.cpp
Unescape Escape View File

@ -1707,7 +1707,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
// Use default properties if we held ctrl down
#if KDE_IS_VERSION(3, 4, 0)
if(kapp->keyboardMouseState() & TQt::ControlButton) {
if(tdeApp->keyboardMouseState() & TQt::ControlButton) {
#else
if(TDEApplication::keyboardModifiers() & TDEApplication::ControlModifier) {
#endif

4
kivio/kiviopart/kivioarrowheadaction.cpp
Unescape Escape View File

@ -82,7 +82,7 @@ void KivioArrowHeadAction::popup( const TQPoint& global )
int KivioArrowHeadAction::plug( TQWidget* widget, int index)
{
// This function is copied from TDEActionMenu::plug
if (kapp && !kapp->authorizeTDEAction(name()))
if (tdeApp && !tdeApp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
if ( widget->inherits("TQPopupMenu") )
@ -93,7 +93,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index );
if ( !isEnabled() )

4
kivio/kiviopart/kiviostencilsetaction.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ void KivioStencilSetAction::popup( const TQPoint& global )
int KivioStencilSetAction::plug( TQWidget* widget, int index)
{
// This function is copied from TDEActionMenu::plug
if (kapp && !kapp->authorizeTDEAction(name()))
if (tdeApp && !tdeApp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
if ( widget->inherits("TQPopupMenu") )
@ -106,7 +106,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index );
if ( !isEnabled() )

2
kivio/kiviopart/ui/kiviooptionsdialog.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
void KivioOptionsDialog::initPage()
{
TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
kapp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32));
tdeApp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32));
m_pageIndex = pageIndex(page);
KivioView* view = static_cast<KivioView*>(parent());

6
koshell/koshell_shell.cpp
Unescape Escape View File

@ -415,12 +415,12 @@ void KoShellWindow::updateCaption()
void KoShellWindow::slotSidebar_Part(int _item)
{
//kdDebug() << "Component part choosed:" << _item << endl;
kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
tdeApp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
m_documentEntry = m_mapComponents[ _item ];
kdDebug() << m_documentEntry.service() << endl;
kdDebug() << m_documentEntry.name() << endl;
KoDocument *doc = m_documentEntry.createDoc();
kapp->restoreOverrideCursor();
tdeApp->restoreOverrideCursor();
if (doc)
{
if ( doc->showEmbedInitDialog( this ) )
@ -721,7 +721,7 @@ void KoShellWindow::showPartSpecificHelp()
if((m_activePage == m_lstPages.end()) || ((*m_activePage).m_pDoc == 0))
return;
kapp->invokeHelp("", (*m_activePage).m_pDoc->instance()->aboutData()->appName(), "");
tdeApp->invokeHelp("", (*m_activePage).m_pDoc->instance()->aboutData()->appName(), "");
}

2
kpresenter/KPrBackground.cpp
Unescape Escape View File

@ -524,7 +524,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
double w = _origSize.width();
w *= ext.width();
#if KDE_IS_VERSION(3,1,90)
TQRect desk = TDEGlobalSettings::desktopGeometry(kapp->activeWindow());
TQRect desk = TDEGlobalSettings::desktopGeometry(tdeApp->activeWindow());
#else
TQRect desk = TQApplication::desktop()->screenGeometry();
#endif

14
kpresenter/KPrCanvas.cpp
Unescape Escape View File

@ -3045,7 +3045,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
TQPainter p;
p.begin( this );
drawBackground( &p,
TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ),
TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() ),
doc->pageList().at( m_step.m_pageNumber ) );
p.end();
}
@ -3397,7 +3397,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
m_effectHandler = 0;
}
TQPixmap screen_orig( kapp->desktop()->width(), kapp->desktop()->height() );
TQPixmap screen_orig( tdeApp->desktop()->width(), tdeApp->desktop()->height() );
KPrPage *page = m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber );
// YABADABADOOOOOOO.... That's a hack :-)
@ -3406,7 +3406,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
//kdDebug(33001) << "Page::doObjEffects - in the strange hack" << endl;
TQPainter p;
p.begin( &screen_orig );
TQRect desktopRect = TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() );
TQRect desktopRect = TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() );
drawBackground( &p, desktopRect, page );
PresStep step( m_step.m_pageNumber, m_step.m_step, m_step.m_subStep, true, true );
drawPresPage( &p, desktopRect ,step );
@ -3545,7 +3545,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
int i = 0;
repaint( false );
kapp->processEvents();
tdeApp->processEvents();
editMode = false;
fillBlack = false;
@ -3582,7 +3582,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
{
i=(*it);
progress.setProgress( ++j );
kapp->processEvents();
tdeApp->processEvents();
if ( progress.wasCancelled() )
break;
@ -3599,10 +3599,10 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
painter->fillRect( m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber )->getZoomPageRect(), white );
printPage( painter, step, printer, rows, cols );
kapp->processEvents();
tdeApp->processEvents();
painter->resetXForm();
kapp->processEvents();
tdeApp->processEvents();
current_slide += slides_per_page;

8
kpresenter/KPrDocumentIface.cpp
Unescape Escape View File

@ -44,13 +44,13 @@ DCOPRef KPrDocumentIface::page( int num )
{
if( num>= (int )doc->getPageNums())
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->pageList().at( num )->dcopObject()->objId() );
}
DCOPRef KPrDocumentIface::masterPage()
{
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->masterPage()->dcopObject()->objId() );
}
@ -204,7 +204,7 @@ bool KPrDocumentIface::isSlideSelected( int pgNum)
DCOPRef KPrDocumentIface::header()
{
if(doc->header())
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->header()->dcopObject()->objId() );
else
return DCOPRef();
@ -214,7 +214,7 @@ DCOPRef KPrDocumentIface::header()
DCOPRef KPrDocumentIface::footer()
{
if(doc->footer())
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->footer()->dcopObject()->objId() );
else
return DCOPRef();

28
kpresenter/KPrMSPresentationSetup.cpp
Unescape Escape View File

@ -87,7 +87,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
for (int dirNum = 101; dirNum < 999; dirNum++) {
slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
@ -97,13 +97,13 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
str = ( path + slidePath );
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// now do the SPP file directory
str = ( path + "/MSSONY" );
@ -111,14 +111,14 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
str = ( path + "/MSSONY/PJ" );
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// create the title slides
TQPixmap titleSlide( 1024, 768 );
@ -133,7 +133,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// and put the specified title string on the first slide
TQFont textFont( "SansSerif", 96 );
@ -148,7 +148,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
@ -171,7 +171,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
}
@ -186,7 +186,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream.setByteOrder(TQDataStream::LittleEndian);
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// We are doing little endian
sppStream << (TQ_UINT32)0x00505053; // SPP magic header
@ -210,7 +210,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream << (TQ_UINT32)0x00000000; // more nulls
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// title 1, 16 bytes null padded
strncpy( buff, "SPJT0001.JPG", 15 );
@ -239,7 +239,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
}
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
// Add in the slide filenames
TQString filename;
@ -250,7 +250,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
sppStream.writeRawBytes( buff, 64 );
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
// OK, now we need to fill to 16384 bytes
@ -262,7 +262,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
sppFile.close();
TDEIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/);
@ -420,7 +420,7 @@ void KPrMSPresentationSetup::showColourGroup(bool on)
void KPrMSPresentationSetup::helpMe()
{
kapp->invokeHelp("ms-export");
tdeApp->invokeHelp("ms-export");
}
void KPrMSPresentationSetup::finish()

4
kpresenter/KPrObject.cpp
Unescape Escape View File

@ -1408,7 +1408,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
_painter->save();
_painter->translate( _zoomHandler->zoomItX(orig.x()), _zoomHandler->zoomItY(orig.y()) );
_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
_painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
_painter->setBrush( tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
KoRect r = getRealRect();
@ -1444,7 +1444,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
zX6=zX6-2;
zY6=zY6-2;
TQBrush brush=kapp->palette().color( TQPalette::Active,TQColorGroup::Base );
TQBrush brush=tdeApp->palette().color( TQPalette::Active,TQColorGroup::Base );
_painter->fillRect( x, y, zX6, zY6, brush );
_painter->fillRect( x, y + h / 2, zX6, zY6, brush);
_painter->fillRect( x, y + h, zX6, zY6, brush );

6
kpresenter/KPrPageIface.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ DCOPRef KPrPageIface::textObject( int num )
{
KPrTextObject * textObj=m_page->textFrameSet(num);
if(textObj)
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
textObj->dcopObject()->objId() );
return DCOPRef();
}
@ -55,7 +55,7 @@ DCOPRef KPrPageIface::selectedObject( )
{
KPrObject * obj=m_page->getSelectedObj();
if(obj)
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
obj->dcopObject()->objId() );
return DCOPRef();
}
@ -70,7 +70,7 @@ DCOPRef KPrPageIface::object( int num )
{
if( num >= (int)m_page->objNums())
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_page->getObject(num)->dcopObject()->objId() );
}

2
kpresenter/KPrTextObjectIface.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ DCOPRef KPrTextObjectIface::startEditing()
KPrDocument *doc=m_textobject->kPresenterDocument();
KPrView *view=doc->firstView();
view->getCanvas()->createEditing( m_textobject);
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
view->getCanvas()->currentTextObjectView()->dcopObject()->objId() );
}

6
kpresenter/KPrView.cpp
Unescape Escape View File

@ -1518,7 +1518,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
TQCString replyType;
m_screenSaverWasEnabled = false;
// is screensaver enabled?
if (kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
if (tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
&& replyType=="bool")
{
TQDataStream replyArg(replyData, IO_ReadOnly);
@ -1529,7 +1529,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
// disable screensaver
TQDataStream arg(data, IO_WriteOnly);
arg << false;
if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
kdWarning(33001) << "Couldn't disable screensaver (using dcop to kdesktop)!" << endl;
else
kdDebug(33001) << "Screensaver successfully disabled" << endl;
@ -1643,7 +1643,7 @@ void KPrView::screenStop()
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << true;
if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
kdWarning(33001) << "Couldn't re-enabled screensaver (using dcop to kdesktop)" << endl;
}
if ( m_dpmsWasEnabled )

12
kpresenter/KPrWebPresentation.cpp
Unescape Escape View File

@ -272,14 +272,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
str = path + "/pics";
TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
const char *pics[] = { "home", "first", "next", "prev", "last", 0 };
@ -295,7 +295,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
TDEIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/);
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
}
@ -318,7 +318,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
}
@ -523,7 +523,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
int p = progressBar->progress();
progressBar->setProgress( ++p );
kapp->processEvents();
tdeApp->processEvents();
}
}
@ -570,7 +570,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
progressBar->setProgress( progressBar->totalSteps() );
kapp->processEvents();
tdeApp->processEvents();
}
void KPrWebPresentation::init()

2
kpresenter/TODO
Unescape Escape View File

@ -29,7 +29,7 @@ KOffice in general:
=======================
- koTemplateChooseDia:
- Restart with last presentation (suggesting it in initial "open" dialog)
(using kapp->getConfig)
(using tdeApp->getConfig)
KPresenter after koffice 1.3

8
kspread/KSpreadAppIface.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ DCOPRef AppIface::createDoc()
Doc* doc = new Doc();
doc->initDoc(KoDocument::InitDocFileNew);
return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
}
DCOPRef AppIface::createDoc( const TQString& name )
@ -52,7 +52,7 @@ DCOPRef AppIface::createDoc( const TQString& name )
Doc* doc = new Doc( 0, name.latin1() );
doc->initDoc( KoDocument::InitDocEmpty, 0 );
return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
}
TQMap<TQString,DCOPRef> AppIface::documents()
@ -64,7 +64,7 @@ TQMap<TQString,DCOPRef> AppIface::documents()
for( ; it != lst.end(); ++it )
{
map[ TQString( (*it)->name() ) ] =
DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
}
return map;
@ -76,7 +76,7 @@ DCOPRef AppIface::document( const TQString& name )
TQValueListIterator<Doc*> it = lst.begin();
for( ; it != lst.end(); ++it )
if ( name == (*it)->name() )
return DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
return DCOPRef();
}

2
kspread/KSpreadDocIface.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ DocIface::DocIface( Doc* _doc )
DCOPRef DocIface::map()
{
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->map()->dcopObject()->objId() );
}

8
kspread/KSpreadMapIface.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ DCOPRef MapIface::sheet( const TQString& name )
if ( !t )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
}
DCOPRef MapIface::sheetByIndex( int index )
@ -60,7 +60,7 @@ DCOPRef MapIface::sheetByIndex( int index )
kdDebug(36001) << "+++++++ Returning table " << t->TQObject::name() << endl;
return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
}
int MapIface::sheetCount() const
@ -87,7 +87,7 @@ TQValueList<DCOPRef> MapIface::sheets()
TQPtrList<Sheet>& lst = m_map->sheetList();
TQPtrListIterator<Sheet> it( lst );
for( ; it.current(); ++it )
t.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
t.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
return t;
}
@ -120,6 +120,6 @@ bool MapIface::processDynamic(const TQCString &fun, const TQByteArray &/*data*/,
replyType = "DCOPRef";
TQDataStream out( replyData, IO_WriteOnly );
out << DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
out << DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
return true;
}

12
kspread/KSpreadTableIface.cpp
Unescape Escape View File

@ -65,7 +65,7 @@ private:
};
KSpread::CellProxy::CellProxy( Sheet* sheet, const TQCString& prefix )
: DCOPObjectProxy( kapp->dcopClient() ), m_prefix( prefix )
: DCOPObjectProxy( tdeApp->dcopClient() ), m_prefix( prefix )
{
m_cell = new CellIface;
m_sheet = sheet;
@ -168,7 +168,7 @@ DCOPRef SheetIface::cell( int x, int y )
TQCString str = objId() + '/' + Cell::name( x, y ).latin1();
return DCOPRef( kapp->dcopClient()->appId(), str );
return DCOPRef( tdeApp->dcopClient()->appId(), str );
}
DCOPRef SheetIface::cell( const TQString& name )
@ -177,7 +177,7 @@ DCOPRef SheetIface::cell( const TQString& name )
str += "/";
str += name.latin1();
return DCOPRef( kapp->dcopClient()->appId(), str );
return DCOPRef( tdeApp->dcopClient()->appId(), str );
}
DCOPRef SheetIface::column( int _col )
@ -185,7 +185,7 @@ DCOPRef SheetIface::column( int _col )
//First col number = 1
if(_col <1)
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_sheet->nonDefaultColumnFormat( _col )->dcopObject()->objId() );
}
@ -195,7 +195,7 @@ DCOPRef SheetIface::row( int _row )
//First row number = 1
if(_row <1)
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_sheet->nonDefaultRowFormat( _row )->dcopObject()->objId() );
}
@ -249,7 +249,7 @@ bool SheetIface::processDynamic( const TQCString& fun, const TQByteArray&/*data*
replyType = "DCOPRef";
TQDataStream out( replyData, IO_WriteOnly );
out << DCOPRef( kapp->dcopClient()->appId(), str );
out << DCOPRef( tdeApp->dcopClient()->appId(), str );
return true;
}

6
kspread/KSpreadViewIface.cpp
Unescape Escape View File

@ -56,17 +56,17 @@ ViewIface::~ViewIface()
DCOPRef ViewIface::doc() const
{
return DCOPRef( kapp->dcopClient()->appId(), m_view->doc()->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), m_view->doc()->dcopObject()->objId() );
}
DCOPRef ViewIface::map() const
{
return DCOPRef( kapp->dcopClient()->appId(), m_view->doc()->map()->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), m_view->doc()->map()->dcopObject()->objId() );
}
DCOPRef ViewIface::sheet() const
{
return DCOPRef( kapp->dcopClient()->appId(), m_view->activeSheet()->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), m_view->activeSheet()->dcopObject()->objId() );
}
void ViewIface::changeNbOfRecentFiles(int _nb)

2
kspread/kspread_doc.cpp
Unescape Escape View File

@ -320,7 +320,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
bool ok=openURL(url);
while (KoDocument::isLoading())
kapp->processEvents();
tdeApp->processEvents();
return ok;

4
kspread/kspread_object.cpp
Unescape Escape View File

@ -205,7 +205,7 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
//_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
_painter->setPen( pen );
_painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
_painter->setBrush( tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
//KoRect r = rotateRectObject(); // TODO: rotation
KoRect r = /*KoRect::fromTQRect*/( bound );
@ -241,7 +241,7 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
zX6=zX6-2;
zY6=zY6-2;
TQBrush brush=kapp->palette().color( TQPalette::Active,TQColorGroup::Base );
TQBrush brush=tdeApp->palette().color( TQPalette::Active,TQColorGroup::Base );
_painter->fillRect( x, y, zX6, zY6, brush );
_painter->fillRect( x, y + h / 2, zX6, zY6, brush);
_painter->fillRect( x, y + h, zX6, zY6, brush );

2
kspread/kspread_view.cpp
Unescape Escape View File

@ -3054,7 +3054,7 @@ void View::setSelectionBorderColor(const TQColor &bdColor)
void View::helpUsing()
{
kapp->invokeHelp( );
tdeApp->invokeHelp( );
}
void View::enableUndo( bool _b )

4
kspread/plugins/calculator/kcalc.cpp
Unescape Escape View File

@ -63,8 +63,8 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
// Set the window caption/title
// connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
// setCaption( kapp->caption() );
// connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
// setCaption( tdeApp->caption() );
// create help button

2
kugar/part/kugar_part.cpp
Unescape Escape View File

@ -174,7 +174,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
else
{
TQString former_localtpl = localtpl;
localtpl = kapp -> dirs() -> findResource( "data", "kugar/templates/" + tpl );
localtpl = tdeApp -> dirs() -> findResource( "data", "kugar/templates/" + tpl );
if ( localtpl.isEmpty() )
{
KURL tmpURL( m_docURL );

4
kword/KWPartFrameSet.cpp
Unescape Escape View File

@ -351,10 +351,10 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
}
#if KDE_IS_VERSION( 3, 4, 0 )
int keyState = kapp->keyboardMouseState();
int keyState = tdeApp->keyboardMouseState();
#else
int keyState = 0;
if ( kapp->keyboardModifiers() & TDEApplication::ControlModifier )
if ( tdeApp->keyboardModifiers() & TDEApplication::ControlModifier )
keyState = TQt::ControlButton;
#endif

4
kword/KWordDocIface.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ DCOPRef KWordDocIface::textFrameSet( int num )
{
if( num>= (int)doc->frameSetCount())
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->textFrameSet( num)->dcopObject()->objId() );
}
@ -46,7 +46,7 @@ DCOPRef KWordDocIface::frameSet( int num )
{
if( num>= (int)doc->frameSetCount())
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
doc->frameSet( num)->dcopObject()->objId() );
}

2
kword/KWordFormulaFrameSetIface.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ DCOPRef KWordFormulaFrameSetIface::startEditing()
TQValueList<KWView *> views = doc->getAllViews();
KWCanvas* canvas = views.first()->getGUI()->canvasWidget();
canvas->editFrameSet( m_formulaFrame );
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
( static_cast<KWFormulaFrameSetEdit *>( canvas->currentFrameSetEdit() ) )
->dcopObject()->objId() );
}

2
kword/KWordPartFrameSetIface.cpp
Unescape Escape View File

@ -44,6 +44,6 @@ void KWordPartFrameSetIface::startEditing()
return;
view->partManager()->addPart( part, false );
view->partManager()->setActivePart( part, view );
/* return DCOPRef( kapp->dcopClient()->appId(),
/* return DCOPRef( tdeApp->dcopClient()->appId(),
(static_cast<KWPartFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() ); */
}

6
kword/KWordTableFrameSetIface.cpp
Unescape Escape View File

@ -58,7 +58,7 @@ DCOPRef KWordTableFrameSetIface::cell( int pos )
if( ! i.current() )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
i->dcopObject()->objId() );
}
@ -66,7 +66,7 @@ DCOPRef KWordTableFrameSetIface::cell( uint row, uint col )
{
if( row>=m_table->getRows() || col>= m_table->getColumns())
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
m_table->cell(row,col)->dcopObject()->objId() );
}
@ -82,6 +82,6 @@ DCOPRef KWordTableFrameSetIface::startEditingCell(uint row, uint col )
if( !m_frametext || m_frametext->isDeleted())
return DCOPRef();
canvas->checkCurrentEdit(m_frametext, true);
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
(static_cast<KWTextFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() );
}

2
kword/KWordTextFrameSetIface.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ DCOPRef KWordTextFrameSetIface::startEditing()
TQValueList<KWView *> views = doc->getAllViews();
KWCanvas* canvas = views.first()->getGUI()->canvasWidget();
canvas->editFrameSet(m_frametext, true);
return DCOPRef( kapp->dcopClient()->appId(),
return DCOPRef( tdeApp->dcopClient()->appId(),
(static_cast<KWTextFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() );
}

2
kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
Unescape Escape View File

@ -285,7 +285,7 @@ void KWMailMergeTDEABCConfig::initSlotSignalConnections()
void KWMailMergeTDEABCConfig::launchAddressbook() const
{
kapp->startServiceByDesktopName( "kaddressbook", TQString() );
tdeApp->startServiceByDesktopName( "kaddressbook", TQString() );
}

4
lib/kformula/main.cpp
Unescape Escape View File

@ -183,7 +183,7 @@ void TestWidget::keyPressEvent(TQKeyEvent* event)
case TQt::Key_L: document->document()->wrapper()->addGenericLowerIndex(); return;
case TQt::Key_M: loadMathML( document, "test.mml" ); return;
case TQt::Key_O: load( document->document(), "test.xml" ); return;
case TQt::Key_Q: kapp->quit(); return;
case TQt::Key_Q: tdeApp->quit(); return;
case TQt::Key_S: save( "test.xml", document->document()->saveXML() ); return;
case TQt::Key_T: std::cout << document->texString().latin1() << std::endl; return;
case TQt::Key_U: document->document()->wrapper()->addGenericUpperIndex(); return;
@ -248,7 +248,7 @@ int main(int argc, char** argv)
app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
DocumentWrapper* wrapper = new DocumentWrapper( kapp->config(), 0 );
DocumentWrapper* wrapper = new DocumentWrapper( tdeApp->config(), 0 );
Document* document = new Document;
wrapper->document( document );
Container* container1 = document->createFormula();

2
lib/kformula/symbolaction.cpp
Unescape Escape View File

@ -117,7 +117,7 @@ SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut,
int SymbolAction::plug( TQWidget* w, int index )
{
if (kapp && !kapp->authorizeTDEAction(name()))
if (tdeApp && !tdeApp->authorizeTDEAction(name()))
return -1;
if ( w->inherits( "TDEToolBar" ) )
{

2
lib/kofficecore/KoApplication.cpp
Unescape Escape View File

@ -91,7 +91,7 @@ bool KoApplication::start()
ResetStarting resetStarting; // reset m_starting to false when we're done
Q_UNUSED( resetStarting );
// Find the *.desktop file corresponding to the kapp instance name
// Find the *.desktop file corresponding to the tdeApp instance name
KoDocumentEntry entry = KoDocumentEntry( KoDocument::readNativeService() );
if ( entry.isEmpty() )
{

8
lib/kofficecore/KoApplicationIface.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat )
return DCOPRef();
}
KoDocument* doc = entry.createDoc( 0 );
return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
}
TQValueList<DCOPRef> KoApplicationIface::getDocuments()
@ -60,7 +60,7 @@ TQValueList<DCOPRef> KoApplicationIface::getDocuments()
{
TQPtrListIterator<KoDocument> it( *documents );
for (; it.current(); ++it )
lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
}
return lst;
}
@ -76,7 +76,7 @@ TQValueList<DCOPRef> KoApplicationIface::getViews()
{
TQPtrListIterator<KoView> itview( it.current()->views() );
for ( ; itview.current(); ++itview )
lst.append( DCOPRef( kapp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) );
lst.append( DCOPRef( tdeApp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) );
}
}
return lst;
@ -90,7 +90,7 @@ TQValueList<DCOPRef> KoApplicationIface::getWindows()
{
TQPtrListIterator<TDEMainWindow> it( *mainWindows );
for (; it.current(); ++it )
lst.append( DCOPRef( kapp->dcopClient()->appId(),
lst.append( DCOPRef( tdeApp->dcopClient()->appId(),
static_cast<KoMainWindow *>(it.current())->dcopObject()->objId() ) );
}
return lst;

12
lib/kofficecore/KoDetailsPane.cpp
Unescape Escape View File

@ -103,8 +103,8 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked()));
changePalette();
if(kapp) {
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
if(tdeApp) {
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
}
TDEListViewItem* selectItem = 0;
@ -183,7 +183,7 @@ void KoTemplatesPane::openTemplate(TQListViewItem* item)
void KoTemplatesPane::changePalette()
{
TQPalette p = kapp ? kapp->palette() : palette();
TQPalette p = tdeApp ? tdeApp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
m_detailsLabel->setPalette(p);
@ -283,8 +283,8 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst
m_documentList->setSorting(-1); // Disable sorting
changePalette();
if(kapp) {
connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
if(tdeApp) {
connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
}
TQString oldGroup = instance->config()->group();
@ -436,7 +436,7 @@ void KoRecentDocumentsPane::updatePreview(const KFileItem* fileItem, const TQPix
void KoRecentDocumentsPane::changePalette()
{
TQPalette p = kapp ? kapp->palette() : palette();
TQPalette p = tdeApp ? tdeApp->palette() : palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
m_detailsLabel->setPalette(p);

4
lib/kofficecore/KoDocument.cpp
Unescape Escape View File

@ -2223,7 +2223,7 @@ TQCString KoDocument::nativeOasisMimeType() const
//static
KService::Ptr KoDocument::readNativeService( TDEInstance *instance )
{
TQString instname = instance ? instance->instanceName() : kapp->instanceName();
TQString instname = instance ? instance->instanceName() : tdeApp->instanceName();
// The new way is: we look for a foopart.desktop in the kde_services dir.
TQString servicepartname = instname + "part.desktop";
@ -2257,7 +2257,7 @@ TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static
if ( KServiceType::serviceType( "KOfficePart" ) == 0L )
kdError(30003) << "The serviceType KOfficePart is missing. Check that you have a kofficepart.desktop file in the share/servicetypes directory." << endl;
else {
TQString instname = instance ? instance->instanceName() : kapp->instanceName();
TQString instname = instance ? instance->instanceName() : tdeApp->instanceName();
if ( instname != "koshell" ) // hack for koshell
kdWarning(30003) << service->desktopEntryPath() << ": no X-TDE-NativeMimeType entry!" << endl;
}

4
lib/kofficecore/KoDocumentIface.cpp
Unescape Escape View File

@ -86,12 +86,12 @@ DCOPRef KoDocumentIface::view( int idx )
if ( !obj )
return DCOPRef();
return DCOPRef( kapp->dcopClient()->appId(), obj->objId() );
return DCOPRef( tdeApp->dcopClient()->appId(), obj->objId() );
}
DCOPRef KoDocumentIface::action( const TQCString &name )
{
return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
}
QCStringList KoDocumentIface::actions()

4
lib/kofficecore/KoMainWindow.cpp
Unescape Escape View File

@ -1466,7 +1466,7 @@ void KoMainWindow::slotProgress(int value) {
d->m_firstTime=false;
}
d->m_progress->setProgress(value);
kapp->processEvents();
tdeApp->processEvents();
}
@ -1635,7 +1635,7 @@ void KoMainWindow::slotEmailFile()
if (!fileURL.isEmpty())
{
kapp->invokeMailer(TQString(), TQString(), TQString(), theSubject,
tdeApp->invokeMailer(TQString(), TQString(), TQString(), theSubject,
TQString(), //body
TQString(),
urls); // attachments

2
lib/kofficecore/KoMainWindowIface.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ KoMainWindowIface::~KoMainWindowIface()
DCOPRef KoMainWindowIface::action( const TQCString &name )
{
return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
}
QCStringList KoMainWindowIface::actions()

20
lib/kofficecore/KoSpeaker.cpp
Unescape Escape View File

@ -136,7 +136,7 @@ void KoSpeaker::probe()
TQPoint pos;
bool spoke = false;
if ( d->m_speakFlags & SpeakFocusWidget ) {
w = kapp->focusWidget();
w = tdeApp->focusWidget();
if (w) {
spoke = maybeSayWidget(w);
if (!spoke)
@ -145,7 +145,7 @@ void KoSpeaker::probe()
}
if ( !spoke && d->m_speakFlags & SpeakPointerWidget ) {
pos = TQCursor::pos();
w = kapp->widgetAt(pos, true);
w = tdeApp->widgetAt(pos, true);
if (w) {
if (!maybeSayWidget(w, pos))
emit customSpeakWidget(w, pos, d->m_speakFlags);
@ -481,12 +481,12 @@ bool KoSpeaker::sayWidget(const TQString& msg)
bool KoSpeaker::startKttsd()
{
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
// If KTTSD not running, start it.
if (!client->isApplicationRegistered("kttsd"))
{
TQString error;
if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) {
if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) {
kdDebug() << "KoSpeaker::startKttsd: error starting KTTSD service: " << error << endl;
d->m_enabled = false;
} else
@ -502,7 +502,7 @@ TQString KoSpeaker::getKttsdVersion()
// did not support version() method, so we must manually marshall this call ourselves.
if (d->m_enabled) {
if (!d->m_versionChecked) {
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
@ -520,7 +520,7 @@ TQString KoSpeaker::getKttsdVersion()
void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talker)
{
if (msg.isEmpty()) return;
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
@ -535,7 +535,7 @@ void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talke
uint KoSpeaker::setText(const TQString &text, const TQString &talker)
{
if (text.isEmpty()) return 0;
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
@ -555,7 +555,7 @@ uint KoSpeaker::setText(const TQString &text, const TQString &talker)
int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/)
{
if (text.isEmpty()) return 0;
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
@ -574,7 +574,7 @@ int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/)
void KoSpeaker::startText(uint jobNum /*=0*/)
{
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
@ -588,7 +588,7 @@ void KoSpeaker::startText(uint jobNum /*=0*/)
void KoSpeaker::removeText(uint jobNum /*=0*/)
{
DCOPClient *client = kapp->dcopClient();
DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;

2
lib/kofficecore/KoView.cpp
Unescape Escape View File

@ -613,7 +613,7 @@ void KoView::slotAutoScroll( )
{
int state=0;
#if KDE_IS_VERSION(3,4,0)
state = kapp->keyboardMouseState();
state = tdeApp->keyboardMouseState();
#endif
pos = canvas()->mapFrom(this, pos);

2
lib/kofficecore/KoViewIface.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ KoViewIface::~KoViewIface()
DCOPRef KoViewIface::action( const TQCString &name )
{
return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
}
QCStringList KoViewIface::actions()

16
lib/kofficecore/kkbdaccessextensions.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ class KPanelKbdSizerIcon : public TQCursor
void show(const TQPoint p) {
if (!isActive) {
originalPos = TQCursor::pos();
kapp->setOverrideCursor(*this);
tdeApp->setOverrideCursor(*this);
isActive = true;
}
if (p != pos())
@ -69,7 +69,7 @@ class KPanelKbdSizerIcon : public TQCursor
void hide() {
if (isActive) {
kapp->restoreOverrideCursor();
tdeApp->restoreOverrideCursor();
TQCursor::setPos(originalPos);
}
isActive = false;
@ -79,9 +79,9 @@ class KPanelKbdSizerIcon : public TQCursor
{
if (shayp != shape()) {
// Must restore and override to get the icon to refresh.
if (isActive) kapp->restoreOverrideCursor();
if (isActive) tdeApp->restoreOverrideCursor();
TQCursor::setShape((TQt::CursorShape)shayp);
if (isActive) kapp->setOverrideCursor(*this);
if (isActive) tdeApp->setOverrideCursor(*this);
}
}
@ -174,12 +174,12 @@ KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* na
d->revAction->setEnabled(false);
d->accessKeysAction->setEnabled(false);
d->icon = new KPanelKbdSizerIcon();
kapp->installEventFilter(this);
tdeApp->installEventFilter(this);
}
KKbdAccessExtensions::~KKbdAccessExtensions()
{
kapp->removeEventFilter(this);
tdeApp->removeEventFilter(this);
if (d->panel) exitSizing();
delete d;
}
@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
TQWidgetList* KKbdAccessExtensions::getAllPanels()
{
TQWidgetList* allWidgets = kapp->allWidgets();
TQWidgetList* allWidgets = tdeApp->allWidgets();
TQWidgetList* allPanels = new TQWidgetList;
TQWidget* widget = allWidgets->first();
while (widget) {
@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys()
}
// Find all visible, focusable widgets and create a TQLabel for each. Don't exceed
// available list of access keys.
TQWidgetList* allWidgets = kapp->allWidgets();
TQWidgetList* allWidgets = tdeApp->allWidgets();
TQWidget* widget = allWidgets->first();
int accessCount = 0;
int maxAccessCount = availableAccessKeys.length();

4
lib/kofficecore/kkbdaccessextensions.h
Unescape Escape View File

@ -83,7 +83,7 @@ class TDEMainWindow;
* When entering sizing mode, the position of the mouse cursor is saved and restored when
* exiting sizing mode.
*
* For a TQSplitter or TQDockWindow to be found, it must be in the kapp::allWidgets() list.
* For a TQSplitter or TQDockWindow to be found, it must be in the tdeApp::allWidgets() list.
*
* @section focus_setting Focus Setting
*
@ -128,7 +128,7 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject
void setStepSize(int s);
protected:
/** Event filter installed on kapp object. */
/** Event filter installed on tdeApp object. */
bool eventFilter( TQObject *o, TQEvent *e );
/** Retrieves a list of all Splitter and DockArea widgets in the application. */

4
lib/kofficeui/KoContextCelp.cpp
Unescape Escape View File

@ -219,7 +219,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e )
e->accept();
if (currentAnchor.startsWith("help://#")) {
//that's not really useful, since koffice documents can be embedded
kapp->invokeHelp(currentAnchor.right(currentAnchor.length()-8));
tdeApp->invokeHelp(currentAnchor.right(currentAnchor.length()-8));
}
else
if (currentAnchor.startsWith("help://")) {
@ -231,7 +231,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e )
helpanchor=helpapp.right(helpapp.length()-pos-1);
helpapp=helpapp.left(pos);
}
kapp->invokeHelp(helpanchor,helpapp);
tdeApp->invokeHelp(helpanchor,helpapp);
}
else
emit linkClicked( currentAnchor );

2
lib/kofficeui/KoInsertLink.cpp
Unescape Escape View File

@ -463,7 +463,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name )
tmpTQLabel->setText(i18n("Recent file:"));
TQComboBox * recentFile = new TQComboBox( this );
recentFile->setMaximumWidth( kapp->desktop()->width()*3/4 );
recentFile->setMaximumWidth( tdeApp->desktop()->width()*3/4 );
lay2->addWidget(recentFile);
TQStringList fileList = TDERecentDocument::recentDocuments();

4
lib/kofficeui/KoSelectAction.cpp
Unescape Escape View File

@ -87,7 +87,7 @@ void KoSelectAction::popup(const TQPoint& global)
int KoSelectAction::plug(TQWidget* widget, int index)
{
// This function is copied from TDEActionMenu::plug
if (kapp && !kapp->authorizeTDEAction(name()))
if (tdeApp && !tdeApp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
if ( widget->inherits("TQPopupMenu") )
@ -98,7 +98,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
if ( hasIconSet() )
id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
else
id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
text(), popupMenu(), -1, index );
if ( !isEnabled() )

2
lib/kofficeui/KoTemplateChooseDia.cpp
Unescape Escape View File

@ -224,7 +224,7 @@ KoTemplateChooseDia::~KoTemplateChooseDia()
static bool cancelQuits() {
bool onlyDoc = !KoDocument::documentList() || KoDocument::documentList()->count() <= 1;
bool onlyMainWindow = !TDEMainWindow::memberList || TDEMainWindow::memberList->count() <= 1;
return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell
return onlyDoc && onlyMainWindow && tdeApp->instanceName() != "koshell"; // hack for koshell
}
KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,

2
lib/kofficeui/kcoloractions.cpp
Unescape Escape View File

@ -234,7 +234,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
kdWarning() << "TDESelectColorAction::plug called with 0 argument\n";
return -1;
}
if (kapp && !kapp->authorizeTDEAction(name()))
if (tdeApp && !tdeApp->authorizeTDEAction(name()))
return -1;
if ( w->inherits("TQPopupMenu") )

4
lib/koproperty/editor.cpp
Unescape Escape View File

@ -390,7 +390,7 @@ void
Editor::changeSetLater()
{
tqApp->eventLoop()->processEvents(TQEventLoop::AllEvents);
if (kapp->hasPendingEvents()) {
if (tdeApp->hasPendingEvents()) {
d->changeSetLaterTimer.start(10, true); //try again...
return;
}
@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it)
if (d->currentWidget) {
if (d->currentWidget->visibleFlag()) {
d->currentWidget->show();
if (hasParent( this, kapp->focusWidget() ))
if (hasParent( this, tdeApp->focusWidget() ))
d->currentWidget->setFocus();
}
}

2
lib/koproperty/editoritem.cpp
Unescape Escape View File

@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget
TQRect r(rect());
TQPainter p(this);
TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
if (!m_miniicon.isNull()) {

2
lib/kotext/KoTextObject.cpp
Unescape Escape View File

@ -2281,7 +2281,7 @@ bool KoTextObject::statistics( TQProgressDialog *progress, ulong & charsWithSpac
{
progress->setProgress(progress->progress()+1);
// MA: resizing if KWStatisticsDialog does not work correct with this enabled, don't know why
kapp->processEvents();
tdeApp->processEvents();
if ( progress->wasCancelled() )
return false;
}

4
lib/kotext/kohyphen/kohyphen.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ KoHyphenator::KoHyphenator()
{
/* Reading config for dictionary encodings from file...*/
TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml");
TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml");
#ifdef DEBUG_HYPHENATOR
kdDebug() << path << endl;
#endif
@ -187,7 +187,7 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const
#ifdef DEBUG_HYPHENATOR
kdDebug() << "Searching dictionary for '" << lang << "' language..." << endl;
#endif
TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic");
TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic");
if (!path.isNull())
{
#ifdef DEBUG_HYPHENATOR

2
lib/kross/main/wdgscriptsmanager.cpp
Unescape Escape View File

@ -320,7 +320,7 @@ void WdgScriptsManager::slotUnloadScript()
void WdgScriptsManager::slotGetNewScript()
{
#ifdef KROSS_SUPPORT_NEWSTUFF
const TQString appname = TDEApplication::kApplication()->name();
const TQString appname = tdeApp->name();
const TQString type = TQString("%1 1.x script").arg(appname);
if(! d->newstuff) {

2
tools/thumbnail/kofficecreator.cpp
Unescape Escape View File

@ -86,7 +86,7 @@ bool KOfficeCreator::create(const TQString &path, int width, int height, TQImage
m_completed = false;
startTimer(5000);
while (!m_completed)
kapp->processOneEvent();
tdeApp->processOneEvent();
killTimers();
// render the page on a bigger pixmap and use smoothScale,

Write Preview
Loading…
Cancel
Save