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

Use tdeApp

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/27/head
Michele Calgaro 5 months ago
parent f836925f06
commit 8ff4fb7305
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
16 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

12
bibletime/bibletime.cpp
Unescape Escape View File

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

2
bibletime/bibletime_init.cpp
Unescape Escape View File

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

4
bibletime/bibletime_slots.cpp
Unescape Escape View File

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

2
bibletime/bibletimeapp.cpp
Unescape Escape View File

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

6
bibletime/frontend/cbtconfig.cpp
Unescape Escape View File

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

4
bibletime/frontend/cexportmanager.cpp
Unescape Escape View File

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

2
bibletime/frontend/cmdiarea.cpp
Unescape Escape View File

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

4
bibletime/frontend/cmoduleindexdialog.cpp
Unescape Escape View File

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

16
bibletime/frontend/cswordsetupdialog.cpp
Unescape Escape View File

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

2
bibletime/frontend/display/chtmlreaddisplay.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state,
moveToAnchor(url.mid(1)); moveToAnchor(url.mid(1));
} }
else if (url.left(7) == "http://") { //open the bowser configured by kdeb 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
} }
} }

2
bibletime/frontend/kstartuplogo.cpp
Unescape Escape View File

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

2
bibletime/frontend/searchdialog/csearchanalysis.cpp
Unescape Escape View File

@ -160,7 +160,7 @@ void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) {
moduleIndex = 0; moduleIndex = 0;
ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); ListCSwordModuleInfo::iterator end_it = m_moduleList.end();
for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { 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)) { if (!m_lastPosList.contains(*it)) {
m_lastPosList.insert(*it,0); m_lastPosList.insert(*it,0);
} }

4
bibletime/frontend/searchdialog/csearchdialogpages.cpp
Unescape Escape View File

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

2
bibletime/main.cpp
Unescape Escape View File

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

2
doc/en/howto/unicode/index.docbook
Unescape Escape View File

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

2
translations/howto.pot
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save