Use tdeApp

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

20 files changed, 55 insertions, 55 deletions

diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 9016add8..31e335ac 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -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;
 }
 
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index c68bd124..6319684d 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -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);
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 102acda3..235ab2d2 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -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);
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index e8adc2ac..b75b74d6 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -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
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index fc126152..eeddfdf2 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -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();
 }
 
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index c6f64d12..349d390a 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -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( "[email protected]",
+		tdeApp->invokeMailer( "[email protected]",
 			TQString(), TQString(),
 			about->appName() + TQCString( " [feedback]" ),
 			wizard->feedbackDocument().toString( 2 ).local8Bit() );
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index c6e75b54..c3238164 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -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;
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index eb415262..11d9e939 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -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...
 
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 9f8bbce3..1737dd6c 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -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();
 }
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index d040f06b..757d1fc8 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
 
 void ImportWizard::progressUpdated(int percent) {
 	m_progressBar->setProgress(percent);
-	TDEApplication::kApplication()->processEvents();
+	tdeApp->processEvents();
 }
 
 //===========================================================
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 4ba0442a..2ba7a65c 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -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");
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 96060220..5bf0030d 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -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);
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index ee606300..246e6b29 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -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;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 5719f9f0..170b8ad0 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -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
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 41289cb6..4097da76 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -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.
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 26efa602..f0016235 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -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");
 
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index dce13f38..f07102eb 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -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();
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 44b957af..25e5cc36 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -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))
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index d28759e9..747ea11e 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -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);
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 61655424..ae834d29 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -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