Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

bibletime/bibletime.cpp

@@ -186,7 +186,7 @@ void BibleTime::readSettings() {
 
 /** Creates a new presenter in the MDI area according to the type of the module. */
 CDisplayWindow* BibleTime::createReadDisplayWindow(ListCSwordModuleInfo modules, const TQString& key) {
-	kapp->setOverrideCursor( waitCursor );
+	tdeApp->setOverrideCursor( waitCursor );
 
 	CDisplayWindow* displayWindow = CDisplayWindow::createReadInstance(modules, m_mdi);
 	if ( displayWindow ) {
@@ -196,7 +196,7 @@ CDisplayWindow* BibleTime::createReadDisplayWindow(ListCSwordModuleInfo modules,
 		displayWindow->lookup(key);
 	}
 
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 	return displayWindow;
 }
 
@@ -210,7 +210,7 @@ CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, con
 }
 
 CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, const TQString& key, const CDisplayWindow::WriteWindowType& type) {
-	kapp->setOverrideCursor( waitCursor );
+	tdeApp->setOverrideCursor( waitCursor );
 
 	ListCSwordModuleInfo modules;
 	modules.append(module);
@@ -222,7 +222,7 @@ CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, co
 		displayWindow->lookup(key);
 	}
 
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 	return displayWindow;
 }
 
@@ -277,12 +277,12 @@ void BibleTime::restoreWorkspace() {
 
 /** Sets the caption of the mainwindow */
 void BibleTime::setCaption( const TQString& ) {
-	TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
+	TDEMainWindow::setPlainCaption( tdeApp->makeStdCaption( m_mdi->currentApplicationCaption() ) );
 }
 
 /** Sets the plain caption of the main window */
 void BibleTime::setPlainCaption( const TQString& ) {
-	TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
+	TDEMainWindow::setPlainCaption( tdeApp->makeStdCaption( m_mdi->currentApplicationCaption() ) );
 }
 
 /** Processes the commandline options given to BibleTime. */

bibletime/bibletime_init.cpp

@@ -104,7 +104,7 @@ void BibleTime::initActions() {
 	TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
 	TDEAction* action = 0;
 
-	action = KStdAction::quit(kapp, TQ_SLOT( quit() ), actionCollection());
+	action = KStdAction::quit(tdeApp, TQ_SLOT( quit() ), actionCollection());
 	action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
 
 	#if TDE_VERSION_MINOR < 1

bibletime/bibletime_slots.cpp

@@ -385,11 +385,11 @@ void BibleTime::slotSearchDefaultBible() {
 }
 
 void BibleTime::openOnlineHelp_Handbook() {
-	kapp->invokeHelp("", "bibletime/handbook/");
+	tdeApp->invokeHelp("", "bibletime/handbook/");
 }
 
 void BibleTime::openOnlineHelp_Howto() {
-	kapp->invokeHelp("", "bibletime/howto/");
+	tdeApp->invokeHelp("", "bibletime/howto/");
 }
 
 /** Saves the current settings into the currently activatred profile. */

bibletime/bibletimeapp.cpp

@@ -40,7 +40,7 @@ void BibleTimeApp::initDCOP() {
 	Q_ASSERT(dcopOk);
 
 	if (dcopOk) {
-		const TQCString appId = dcopClient()->registerAs(kapp->name(), false);
+		const TQCString appId = dcopClient()->registerAs(tdeApp->name(), false);
 		//   dcopClient()->setDefaultObject("BibleTimeInterface");
 	}
 }

bibletime/frontend/cbtconfig.cpp

@@ -665,11 +665,11 @@ void CBTConfig::setModuleEncryptionKey( const TQString& module, const TQString&
 TDEConfig* const CBTConfig::getConfig() {
 	TDEConfig* config = TDEGlobal::config();
 
-	if (TDEApplication::kApplication()->sessionSaving()) {
+	if (tdeApp->sessionSaving()) {
 		tqWarning("Using session config");
-		//    config = TDEApplication::kApplication()->sessionConfig();
+		//    config = tdeApp->sessionConfig();
 	}
-	else if (TDEApplication::kApplication()->isRestored()) {
+	else if (tdeApp->isRestored()) {
 		tqWarning("isRestored(): Using session config");
 	}
 

bibletime/frontend/cexportmanager.cpp

@@ -498,7 +498,7 @@ void CExportManager::setProgressRange( const int items ) {
 		dlg->setMinimumDuration(0);
 		dlg->show();
 		//     dlg->repaint();
-		TDEApplication::kApplication()->processEvents(); //do not lock the GUI!
+		tdeApp->processEvents(); //do not lock the GUI!
 	}
 }
 
@@ -539,5 +539,5 @@ void CExportManager::closeProgressDialog() {
 		dlg->reset();
 	}
 	
-	TDEApplication::kApplication()->processEvents(); //do not lock the GUI!
+	tdeApp->processEvents(); //do not lock the GUI!
 }

bibletime/frontend/cmdiarea.cpp

@@ -90,7 +90,7 @@ void CMDIArea::childEvent( TQChildEvent * e ) {
 
 	if (!windowList().count()) {
 		m_appCaption = TQString();
-		emit sigSetToplevelCaption( TDEApplication::kApplication()->makeStdCaption(m_appCaption) );
+		emit sigSetToplevelCaption( tdeApp->makeStdCaption(m_appCaption) );
 		emit sigLastPresenterClosed();
 	}
 

bibletime/frontend/cmoduleindexdialog.cpp

@@ -87,14 +87,14 @@ void CModuleIndexDialog::slotModuleProgress( int percentage ) {
 //	tqDebug("progress %d", percentage);
 	
 	progress->progressBar()->setProgress( m_currentModuleIndex * 100 + percentage );
-	TDEApplication::kApplication()->processEvents( 10 ); //10 ms only
+	tdeApp->processEvents( 10 ); //10 ms only
 }
 
 void CModuleIndexDialog::slotFinished( ) {
 	tqDebug("indexing finished()");
 	
 	progress->progressBar()->setProgress( progress->progressBar()->totalSteps() );
-	TDEApplication::kApplication()->processEvents( 1 ); //1 ms only
+	tdeApp->processEvents( 1 ); //1 ms only
 }
 
 #include "cmoduleindexdialog.moc"

bibletime/frontend/cswordsetupdialog.cpp

@@ -449,7 +449,7 @@ the module remote installation feature!</b>")
 
 	void CSwordSetupDialog::populateRemoveModuleListView() {
 		CSwordBackend myBackend;
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 		myBackend.initModules();
 
 		m_removeModuleListView->clear();
@@ -487,7 +487,7 @@ the module remote installation feature!</b>")
 		m_progressDialog->setMinimumDuration(0); //show immediately
 		m_progressDialog->setAutoClose(false);
 		m_progressDialog->show();
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 
 		connect(
 			m_progressDialog, TQ_SIGNAL(cancelClicked()),
@@ -527,7 +527,7 @@ the module remote installation feature!</b>")
 	}
 
 	bool CSwordSetupDialog::populateInstallModuleListView( const TQString& sourceName ) {
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 		Q_ASSERT(m_installModuleListView);
 		if (!m_installModuleListView) { // this may be an update after removing modules
 			return false;
@@ -561,7 +561,7 @@ the module remote installation feature!</b>")
 		CSwordBackend* local_backend = CPointers::backend();
 		Q_ASSERT(local_backend);
 		//  tqWarning("local backend has path %s", local_backend->);
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 		//local_backend.initModules();
 
 		//  tqWarning("config path3 is %s", remote_backend->configPath);
@@ -727,7 +727,7 @@ the module remote installation feature!</b>")
 			m_progressDialog->setMinimumDuration(0); //show immediately
 			m_progressDialog->setAutoClose(false);
 			m_progressDialog->show();
-			TDEApplication::kApplication()->processEvents();
+			tdeApp->processEvents();
 
 			connect(
 				m_progressDialog, TQ_SIGNAL(cancelClicked()),
@@ -797,7 +797,7 @@ the module remote installation feature!</b>")
 			m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
 			m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
 		}
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 	}
 
 	void CSwordSetupDialog::slot_showInstallSourcePage() {
@@ -910,14 +910,14 @@ the module remote installation feature!</b>")
 		if (m_currentInstallMgr) {
 			m_currentInstallMgr->terminate();
 		}
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 	}
 
 	void CSwordSetupDialog::slot_moduleRefreshCompleted(const int /*total*/, const int current) {
 		if (m_progressDialog) {
 			m_progressDialog->progressBar()->setProgress(current);
 		}
-		TDEApplication::kApplication()->processEvents();
+		tdeApp->processEvents();
 	}
 
 } // NAMESPACE

bibletime/frontend/display/chtmlreaddisplay.cpp

@@ -240,7 +240,7 @@ void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state,
 		moveToAnchor(url.mid(1));
 	}
 	else if (url.left(7) == "http://") { //open the bowser configured by kdeb
-		TDEApplication::kApplication()->invokeBrowser( url ); //ToDo: Not yet tested
+		tdeApp->invokeBrowser( url ); //ToDo: Not yet tested
 	}
 }
 

bibletime/frontend/kstartuplogo.cpp

@@ -95,7 +95,7 @@ TDEStartupLogo::TDEStartupLogo()
 void TDEStartupLogo::setText(const TQString text) {
 	//Please not make the text bold & let the first character be blank
 	textLabel->setText( TQString::fromLatin1(" %1").arg(text) );
-	TDEApplication::kApplication()->processEvents();
+	tdeApp->processEvents();
 }
 
 /** Makes the splashscreen the toplevel window. */

bibletime/frontend/searchdialog/csearchanalysis.cpp

@@ -160,7 +160,7 @@ void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) {
 		moduleIndex = 0;
 		ListCSwordModuleInfo::iterator end_it = m_moduleList.end();
 		for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) {
-			TDEApplication::kApplication()->processEvents( 10 ); //10 ms only
+			tdeApp->processEvents( 10 ); //10 ms only
 			if (!m_lastPosList.contains(*it)) {
 				m_lastPosList.insert(*it,0);
 			}

bibletime/frontend/searchdialog/csearchdialogpages.cpp

@@ -73,7 +73,7 @@ void StrongsResultClass::initStrongsResults(void) {
 	count = result.Count();
 	if (!count)
 		return;
-	TDEApplication::kApplication()->processEvents( 1 ); //1 ms only
+	tdeApp->processEvents( 1 ); //1 ms only
 	srList.clear();
 	// for whatever reason the text "Parsing...translations." does not appear.
 	// this is not critical but the text is necessary to get the dialog box
@@ -85,7 +85,7 @@ void StrongsResultClass::initStrongsResults(void) {
 	progress->raise();
 	for (index = 0; index < count; index++){
 		progress->progressBar()->setProgress( int( (index*100) / count ) );
- 		TDEApplication::kApplication()->processEvents( 1 ); //1 ms only
+ 		tdeApp->processEvents( 1 ); //1 ms only
 
 		key = TQString::fromUtf8(result.GetElement(index)->getText());
 		text = render.renderSingleKey(key, modules, settings);

bibletime/main.cpp

@@ -245,7 +245,7 @@ int main(int argc, char* argv[]) {
 		showDebugMessages = true;
 	}
 
-	if (kapp->isRestored()) {
+	if (tdeApp->isRestored()) {
 		//    tqWarning("Restoring BibleTime");
 		//RESTORE( BibleTime );
 		int n = 1;

doc/en/howto/unicode/index.docbook

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY kapp "&bibletimehandbook;">
+  <!ENTITY tdeApp "&bibletimehandbook;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 

translations/howto.pot

@@ -21,7 +21,7 @@ msgstr ""
 msgid "<application>BibleTime</application>"
 msgstr ""
 
-#. type: Content of the kapp entity
+#. type: Content of the tdeApp entity
 #: index.docbook:4
 msgid "&bibletimehandbook;"
 msgstr ""