From c2b5ed43b9f2a17a3840732e3a82e33f16422d9e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:03:43 -0600 Subject: Rename obsolete tq methods to standard names --- bibletime/backend/btstringmgr.h | 2 +- bibletime/backend/cswordkey.cpp | 8 +- bibletime/backend/cswordlexiconmoduleinfo.cpp | 4 +- bibletime/backend/cswordtreekey.h | 2 +- bibletime/bibletime_slots.cpp | 2 +- bibletime/frontend/cexportmanager.cpp | 6 +- bibletime/frontend/cinfodisplay.cpp | 6 +- bibletime/frontend/coptionsdialog.cpp | 68 +++++++-------- bibletime/frontend/cprinter.cpp | 2 +- bibletime/frontend/cswordsetupdialog.cpp | 98 +++++++++++----------- .../frontend/cswordsetupinstallsourcesdialog.cpp | 16 ++-- bibletime/frontend/display/cdisplay.cpp | 2 +- bibletime/frontend/keychooser/cbiblekeychooser.cpp | 6 +- bibletime/frontend/keychooser/cbooktreechooser.cpp | 4 +- .../frontend/keychooser/clexiconkeychooser.cpp | 2 +- bibletime/frontend/keychooser/crefselectdialog.cpp | 12 +-- bibletime/frontend/manageindicesform.cpp | 10 +-- bibletime/frontend/manageindicesform.ui | 2 +- bibletime/frontend/searchdialog/cmodulechooser.cpp | 4 +- .../frontend/searchdialog/csearchanalysis.cpp | 8 +- .../frontend/searchdialog/searchoptionsform.cpp | 6 +- 21 files changed, 135 insertions(+), 135 deletions(-) diff --git a/bibletime/backend/btstringmgr.h b/bibletime/backend/btstringmgr.h index cc50e68..04e42c7 100644 --- a/bibletime/backend/btstringmgr.h +++ b/bibletime/backend/btstringmgr.h @@ -40,7 +40,7 @@ public: protected: /** Enable Unicode support. - * Reimplementation to show tqunicode support. + * Reimplementation to show unicode support. */ virtual bool supportsUnicode() const; diff --git a/bibletime/backend/cswordkey.cpp b/bibletime/backend/cswordkey.cpp index 1a6a46d..a6c5f94 100644 --- a/bibletime/backend/cswordkey.cpp +++ b/bibletime/backend/cswordkey.cpp @@ -121,8 +121,8 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) { if (mode == HTMLEscaped) { //we have to encode all UTF-8 in HTML escapes - // go though every character and write down the escaped HTML tqunicode entity - // form is &#; + // go though every character and write down the escaped HTML unicode entity + // form is &#; TQString ret; TQChar c; const unsigned int length = text.length(); @@ -133,9 +133,9 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) { if (c.latin1()) { //normal latin1 character ret.append(c); } - else {//tqunicode character, needs to be escaped + else {//unicode character, needs to be escaped ret.append("&#") - .append(c.tqunicode()) + .append(c.unicode()) .append(";"); } } diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp index 3ae1543..5777082 100644 --- a/bibletime/backend/cswordlexiconmoduleinfo.cpp +++ b/bibletime/backend/cswordlexiconmoduleinfo.cpp @@ -57,7 +57,7 @@ TQStringList* const CSwordLexiconModuleInfo::entries() { } sword::SWModule* my_module = module(); - bool is_tqunicode = isUnicode(); + bool is_unicode = isUnicode(); if (!m_entryList) { m_entryList = new TQStringList(); @@ -103,7 +103,7 @@ TQStringList* const CSwordLexiconModuleInfo::entries() { int i = 0; do { - if ( is_tqunicode ) { + if ( is_unicode ) { m_entryList->append(TQString::fromUtf8(my_module->KeyText())); // qWarning("Entry: %s", my_module->KeyText() ); } diff --git a/bibletime/backend/cswordtreekey.h b/bibletime/backend/cswordtreekey.h index 31d9896..5267050 100644 --- a/bibletime/backend/cswordtreekey.h +++ b/bibletime/backend/cswordtreekey.h @@ -45,7 +45,7 @@ public: */ virtual CSwordTreeKey* copy() const; /** - * Returns the last part of the current key as tqunicode decoded TQString. + * Returns the last part of the current key as unicode decoded TQString. * Use this instead of TreeKeyIdx::getLocalName() to avoid encoding problems. */ virtual const TQString getLocalNameUnicode() const; diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp index cff5fe6..1e73427 100644 --- a/bibletime/bibletime_slots.cpp +++ b/bibletime/bibletime_slots.cpp @@ -324,7 +324,7 @@ void BibleTime::slotToggleToolbar() { /** Shows or hides the groupmanager. */ void BibleTime::slotToggleMainIndex() { - //we use the parent widget because the main index is enclosed in a tqlayout which adds the label at the top + //we use the parent widget because the main index is enclosed in a layout which adds the label at the top if (m_viewMainIndex_action->isChecked()) { m_mainIndex->parentWidget()->show(); } diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp index fc9b252..483332c 100644 --- a/bibletime/frontend/cexportmanager.cpp +++ b/bibletime/frontend/cexportmanager.cpp @@ -237,7 +237,7 @@ const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bo text = render->renderSingleKey(key->key(), modules); } - KApplication::tqclipboard()->setText(text); + KApplication::clipboard()->setText(text); return true; }; @@ -272,7 +272,7 @@ const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* m } const TQString text = render->renderKeyTree(tree); - KApplication::tqclipboard()->setText(text); + KApplication::clipboard()->setText(text); return true; }; @@ -306,7 +306,7 @@ const bool CExportManager::copyKeyList(TQPtrList& list, const Format }; const TQString text = render->renderKeyTree(tree); - KApplication::tqclipboard()->setText(text); + KApplication::clipboard()->setText(text); return true; }; diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp index 62a8419..f321ccd 100644 --- a/bibletime/frontend/cinfodisplay.cpp +++ b/bibletime/frontend/cinfodisplay.cpp @@ -49,7 +49,7 @@ namespace InfoDisplay { CInfoDisplay::CInfoDisplay(TQWidget *parent, const char *name) : TQWidget(parent, name) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); TQLabel* headingLabel = new TQLabel(i18n("Mag (\"shift\" to lock)"),this); headingLabel->setMargin(5); @@ -63,8 +63,8 @@ namespace InfoDisplay { TQT_SLOT(lookup(const TQString&, const TQString&)) ); - tqlayout->addWidget(headingLabel); - tqlayout->addWidget(m_htmlPart->view()); + layout->addWidget(headingLabel); + layout->addWidget(m_htmlPart->view()); } diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp index 6c968b9..e03a33d 100644 --- a/bibletime/frontend/coptionsdialog.cpp +++ b/bibletime/frontend/coptionsdialog.cpp @@ -136,8 +136,8 @@ const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) { /** Initializes the startup section of the OD. */ void COptionsDialog::initDisplay() { TQFrame* page = addPage(i18n("Display"), TQString(), DesktopIcon(CResMgr::settings::startup::icon,32)); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page); - tqlayout->setSpacing( 5 ); + TQVBoxLayout* layout = new TQVBoxLayout(page); + layout->setSpacing( 5 ); {//daily tips m_settings.startup.showTips = new TQCheckBox(page); @@ -149,8 +149,8 @@ void COptionsDialog::initDisplay() { m_settings.startup.showTips->setChecked( CBTConfig::get (CBTConfig::tips) ); } - tqlayout->addWidget(m_settings.startup.showTips); - tqlayout->addSpacing(5); + layout->addWidget(m_settings.startup.showTips); + layout->addSpacing(5); { //startup logo m_settings.startup.showLogo = new TQCheckBox(page); @@ -161,39 +161,39 @@ void COptionsDialog::initDisplay() { m_settings.startup.showLogo->setChecked(CBTConfig::get (CBTConfig::logo)); - tqlayout->addWidget(m_settings.startup.showLogo); - tqlayout->addSpacing(20); + layout->addWidget(m_settings.startup.showLogo); + layout->addSpacing(20); } - tqlayout->addWidget( + layout->addWidget( CToolClass::explanationLabel(page, i18n("Display templates"), i18n("Display templates define how text is displayed. Please choose a template you like.") ) ); - tqlayout->addSpacing( 5 ); + layout->addSpacing( 5 ); - TQHBoxLayout* hboxtqlayout = new TQHBoxLayout(); + TQHBoxLayout* hboxlayout = new TQHBoxLayout(); m_settings.displayStyle.styleChooser = new TQComboBox( page ); //create first to enable buddy for label connect( m_settings.displayStyle.styleChooser, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( updateStylePreview() ) ); - hboxtqlayout->addWidget( + hboxlayout->addWidget( new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) ); - hboxtqlayout->addWidget( m_settings.displayStyle.styleChooser ); - hboxtqlayout->addStretch(); - tqlayout->addLayout( hboxtqlayout ); + hboxlayout->addWidget( m_settings.displayStyle.styleChooser ); + hboxlayout->addStretch(); + layout->addLayout( hboxlayout ); m_settings.displayStyle.stylePreview = new KHTMLPart(page); - tqlayout->addWidget( + layout->addWidget( new TQLabel( m_settings.displayStyle.stylePreview->view(), i18n("Style preview"), page ) ); - tqlayout->addWidget(m_settings.displayStyle.stylePreview->view()); + layout->addWidget(m_settings.displayStyle.stylePreview->view()); m_settings.displayStyle.styleChooser->insertStringList( CPointers::displayTemplateManager()->availableTemplates() @@ -212,11 +212,11 @@ void COptionsDialog::initDisplay() { /** Init fonts section. */ void COptionsDialog::initLanguages() { TQFrame* page = addPage(i18n("Languages"), TQString(), DesktopIcon(CResMgr::settings::fonts::icon, 32)); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page,5); - tqlayout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* layout = new TQVBoxLayout(page,5); + layout->setResizeMode( TQLayout::Minimum ); { //Sword locales - tqlayout->addWidget( + layout->addWidget( CToolClass::explanationLabel(page, i18n("Specify a language for names of Bible books"), i18n("Sword has a number of locales available which can be used to internationalize the \ names of books of the Bible. You can specify which locale to use. If you want to \ @@ -233,7 +233,7 @@ void COptionsDialog::initLanguages() { hBoxLayout->addWidget(label); hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo); hBoxLayout->addStretch(); - tqlayout->addLayout(hBoxLayout); + layout->addLayout(hBoxLayout); TQStringList languageNames; languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() ); @@ -294,10 +294,10 @@ void COptionsDialog::initLanguages() { } } - tqlayout->addSpacing( 20 ); + layout->addSpacing( 20 ); } { //Font settings - tqlayout->addWidget( + layout->addWidget( CToolClass::explanationLabel( page, i18n("Select custom fonts per-language"), @@ -306,7 +306,7 @@ void COptionsDialog::initLanguages() { to be displayed correctly.") ) ); - tqlayout->addSpacing(5); + layout->addSpacing(5); TQHBoxLayout* hLayout = new TQHBoxLayout(); m_settings.fonts.usage = new TQComboBox(page); @@ -338,12 +338,12 @@ void COptionsDialog::initLanguages() { connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool))); hLayout->addWidget(m_settings.fonts.useOwnFontBox); - tqlayout->addLayout(hLayout); + layout->addLayout(hLayout); //#warning TODO: remember the last selected font and jump there. m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5); m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog.")); - tqlayout->addWidget(m_settings.fonts.fontChooser); + layout->addWidget(m_settings.fonts.fontChooser); connect(m_settings.fonts.fontChooser, TQT_SIGNAL(fontSelected(const TQFont&)), TQT_SLOT(newDisplayWindowFontSelected(const TQFont&))); connect(m_settings.fonts.usage, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(newDisplayWindowFontAreaSelected(const TQString&))); @@ -658,26 +658,26 @@ void COptionsDialog::initSword() { { // ---------- new tab: filters -------- // TQFrame* currentTab = new TQFrame(tabCtl); tabCtl->addTab(currentTab, i18n("Text filters")); - TQVBoxLayout* tqlayout = new TQVBoxLayout(currentTab,5); + TQVBoxLayout* layout = new TQVBoxLayout(currentTab,5); - tqlayout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"), + layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"), i18n("Filters control the appearance of text. \ Here you can specify default settings for all filters. \ You can change the filter settings in each display window, of course.")) ); - tqlayout->addSpacing(5); + layout->addSpacing(5); m_settings.swords.lineBreaks = new TQCheckBox(currentTab); m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse")); m_settings.swords.lineBreaks->setChecked(CBTConfig::get (CBTConfig::lineBreaks)); - tqlayout->addWidget(m_settings.swords.lineBreaks); + layout->addWidget(m_settings.swords.lineBreaks); m_settings.swords.verseNumbers = new TQCheckBox(currentTab); m_settings.swords.verseNumbers->setText(i18n("Show verse numbers")); m_settings.swords.verseNumbers->setChecked(CBTConfig::get (CBTConfig::verseNumbers)); - tqlayout->addWidget(m_settings.swords.verseNumbers); + layout->addWidget(m_settings.swords.verseNumbers); m_settings.swords.headings = new TQCheckBox(currentTab); m_settings.swords.headings->setText(i18n("Show section headings")); @@ -690,13 +690,13 @@ You can change the filter settings in each display window, of course.")) ); m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references")); m_settings.swords.scriptureReferences->setChecked(CBTConfig::get (CBTConfig::scriptureReferences)); - tqlayout->addWidget(m_settings.swords.scriptureReferences); + layout->addWidget(m_settings.swords.scriptureReferences); m_settings.swords.greekAccents = new TQCheckBox(currentTab); m_settings.swords.greekAccents->setText(i18n("Show Greek accents")); m_settings.swords.greekAccents->setChecked(CBTConfig::get (CBTConfig::greekAccents)); - tqlayout->addWidget(m_settings.swords.greekAccents); + layout->addWidget(m_settings.swords.greekAccents); m_settings.swords.hebrewPoints = new TQCheckBox(currentTab); m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points")); @@ -714,15 +714,15 @@ You can change the filter settings in each display window, of course.")) ); m_settings.swords.morphSegmentation->setText(i18n("Show morph segmentation")); m_settings.swords.morphSegmentation->setChecked(CBTConfig::get (CBTConfig::morphSegmentation)); - tqlayout->addWidget(m_settings.swords.morphSegmentation); + layout->addWidget(m_settings.swords.morphSegmentation); m_settings.swords.textualVariants = new TQCheckBox(currentTab); m_settings.swords.textualVariants->setText(i18n("Use textual variants")); m_settings.swords.textualVariants->setChecked(CBTConfig::get (CBTConfig::textualVariants)); - tqlayout->addWidget(m_settings.swords.textualVariants); + layout->addWidget(m_settings.swords.textualVariants); - tqlayout->addStretch(4); + layout->addStretch(4); } } diff --git a/bibletime/frontend/cprinter.cpp b/bibletime/frontend/cprinter.cpp index a3b0101..23df40b 100644 --- a/bibletime/frontend/cprinter.cpp +++ b/bibletime/frontend/cprinter.cpp @@ -53,7 +53,7 @@ namespace Printing { m_htmlPart->write(renderKeyTree(tree)); m_htmlPart->end(); - m_htmlPart->view()->tqlayout(); + m_htmlPart->view()->layout(); m_htmlPart->view()->print(); } diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp index 7f188cd..74bf217 100644 --- a/bibletime/frontend/cswordsetupdialog.cpp +++ b/bibletime/frontend/cswordsetupdialog.cpp @@ -75,44 +75,44 @@ namespace BookshelfManager { TQFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), TQString(), SmallIcon("bt_swordconfig",32)); page->setMinimumSize(500,400); - TQGridLayout* tqlayout = new TQGridLayout(page, 6, 4); - tqlayout->setMargin(5); + TQGridLayout* layout = new TQGridLayout(page, 6, 4); + layout->setMargin(5); - tqlayout->setSpacing(10); - tqlayout->setColStretch(0,1); - tqlayout->setRowStretch(5,1); + layout->setSpacing(10); + layout->setColStretch(0,1); + layout->setRowStretch(5,1); TQLabel* mainLabel = CToolClass::explanationLabel(page, i18n("Configure bookshelf path(s)"), i18n("You can store your bookshelfs in one or more directories, which you can specify here.") ); - tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); + layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); TQString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename(); TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is %1").arg(swordConfPath), page); - tqlayout->addMultiCellWidget(confPathLabel, 1,1,0,3); + layout->addMultiCellWidget(confPathLabel, 1,1,0,3); m_swordPathListBox = new TQListView(page); // m_swordPathListBox->setFullWidth(true); m_swordPathListBox->addColumn(i18n("Path to bookshelf")); connect(m_swordPathListBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slot_swordPathSelected())); - tqlayout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1); + layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1); m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page); m_swordEditPathButton->setIconSet(SmallIcon("edit", 16)); connect(m_swordEditPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordEditClicked())); - tqlayout->addWidget(m_swordEditPathButton, 2, 3); + layout->addWidget(m_swordEditPathButton, 2, 3); m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page); m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16)); connect(m_swordAddPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordAddClicked())); - tqlayout->addWidget(m_swordAddPathButton, 3,3); + layout->addWidget(m_swordAddPathButton, 3,3); m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page); m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16)); connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked())); - tqlayout->addWidget(m_swordRemovePathButton, 4,3); + layout->addWidget(m_swordRemovePathButton, 4,3); setupSwordPathListBox(); } @@ -120,25 +120,25 @@ namespace BookshelfManager { void CSwordSetupDialog::initInstall() { m_installPage = addPage(i18n("Install/Update works"), TQString(), SmallIcon("bt_bible",32)); - TQVBoxLayout* vboxtqlayout = new TQVBoxLayout(m_installPage); - TQHBoxLayout* hboxtqlayout = new TQHBoxLayout(); - hboxtqlayout->setAutoAdd( true ); + TQVBoxLayout* vboxlayout = new TQVBoxLayout(m_installPage); + TQHBoxLayout* hboxlayout = new TQHBoxLayout(); + hboxlayout->setAutoAdd( true ); - vboxtqlayout->addLayout(hboxtqlayout); + vboxlayout->addLayout(hboxlayout); m_installWidgetStack = new TQWidgetStack(m_installPage); - hboxtqlayout->addWidget(m_installWidgetStack); + hboxlayout->addWidget(m_installWidgetStack); m_installSourcePage = new TQWidget(0); m_installWidgetStack->addWidget(m_installSourcePage); // m_installSourcePage->setMinimumSize(500,400); - TQGridLayout* tqlayout = new TQGridLayout(m_installSourcePage, 7, 3); - tqlayout->setMargin(5); - tqlayout->setSpacing(10); - tqlayout->setRowStretch(6,5); - tqlayout->setColStretch(0,5); + TQGridLayout* layout = new TQGridLayout(m_installSourcePage, 7, 3); + layout->setMargin(5); + layout->setSpacing(10); + layout->setRowStretch(6,5); + layout->setColStretch(0,5); TQLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage, i18n("Install/update works - Step 1"), @@ -147,39 +147,39 @@ After that step click on the connect button.
\ WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use \ the module remote installation feature!") ); - tqlayout->addMultiCellWidget(installLabel, 0,0,0,2); + layout->addMultiCellWidget(installLabel, 0,0,0,2); TQLabel* sourceHeadingLabel = new TQLabel(TQString("%1").arg(i18n("Select library")), m_installSourcePage); - tqlayout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1); + layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1); m_sourceCombo = new TQComboBox(m_installSourcePage); - tqlayout->addWidget(m_sourceCombo, 2, 0); + layout->addWidget(m_sourceCombo, 2, 0); TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage); deleteSourceButton->setIconSet(SmallIcon("remove", 16)); connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource())); - tqlayout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft); + layout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft); TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage); addSourceButton->setIconSet(SmallIcon("folder_new", 16)); connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource())); - tqlayout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft); + layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft); m_sourceLabel = new TQLabel(m_installSourcePage); - tqlayout->addMultiCellWidget(m_sourceLabel, 3,3,0,1); + layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1); TQLabel* targetHeadingLabel = new TQLabel(TQString("%1").arg(i18n("Select bookshelf path")), m_installSourcePage); - tqlayout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1); + layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1); m_targetCombo = new TQComboBox(m_installSourcePage); - tqlayout->addWidget(m_targetCombo, 5, 0); + layout->addWidget(m_targetCombo, 5, 0); m_targetLabel = new TQLabel(m_installSourcePage); - tqlayout->addMultiCellWidget(m_targetLabel, 6,6,0,0,TQt::AlignTop); + layout->addMultiCellWidget(m_targetLabel, 6,6,0,0,TQt::AlignTop); - //part beloew main tqlayout with the back/next buttons + //part beloew main layout with the back/next buttons TQHBoxLayout* myHBox = new TQHBoxLayout(); - vboxtqlayout->addLayout(myHBox); + vboxlayout->addLayout(myHBox); m_installBackButton = new TQPushButton(i18n("Back"), m_installPage); m_installBackButton->setIconSet(SmallIcon("back",16)); @@ -207,28 +207,28 @@ the module remote installation feature!") page->setMinimumSize(500,400); - TQGridLayout* tqlayout = new TQGridLayout(page, 4, 4); - tqlayout->setMargin(5); + TQGridLayout* layout = new TQGridLayout(page, 4, 4); + layout->setMargin(5); - tqlayout->setSpacing(10); - tqlayout->setColStretch(1,1); - tqlayout->setRowStretch(2,1); + layout->setSpacing(10); + layout->setColStretch(1,1); + layout->setRowStretch(2,1); TQLabel* mainLabel= CToolClass::explanationLabel(page, i18n("Remove installed work(s)"), i18n("This dialog lets you remove installed works from your system. Choose the modules and then click on the remove button.") ); - tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); + layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); TQLabel* headingLabel = new TQLabel(TQString("%1").arg(i18n("Select works to be uninstalled")), page); - tqlayout->addMultiCellWidget(headingLabel, 1, 1, 0, 3); + layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3); m_removeModuleListView = new CSwordSetupModuleListView(page, false); - tqlayout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3); + layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3); m_removeRemoveButton = new TQPushButton(i18n("Remove selected work(s)"), page); m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) ); - tqlayout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight); + layout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight); connect(m_removeRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_doRemoveModules())); @@ -612,16 +612,16 @@ the module remote installation feature!") if (!m_installModuleListPage) { //the widgets are not yet created m_installModuleListPage = new TQWidget(0); - TQGridLayout* tqlayout = new TQGridLayout(m_installModuleListPage, 7, 2); - tqlayout->setMargin(5); - tqlayout->setSpacing(10); + TQGridLayout* layout = new TQGridLayout(m_installModuleListPage, 7, 2); + layout->setMargin(5); + layout->setSpacing(10); TQLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage, i18n("Install/update works - Step 2"), i18n("Please choose the works which should be installed and/or updated and click the install button.") ); - tqlayout->addMultiCellWidget(installLabel, 0,0,0,1); - tqlayout->setRowStretch(0,0); + layout->addMultiCellWidget(installLabel, 0,0,0,1); + layout->setRowStretch(0,0); m_installWidgetStack->addWidget(m_installModuleListPage); m_installModuleListPage->setMinimumSize(500,400); @@ -631,9 +631,9 @@ the module remote installation feature!") sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource()); m_installModuleListView = new CSwordSetupModuleListView(m_installModuleListPage, true, &is); - tqlayout->addMultiCellWidget( m_installModuleListView, 1,6,0,1); - tqlayout->setColStretch(0,5); - tqlayout->setRowStretch(1,5); + layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1); + layout->setColStretch(0,5); + layout->setRowStretch(1,5); connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged())); } diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp index 8778e8b..681c0db 100644 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp +++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp @@ -49,29 +49,29 @@ namespace BookshelfManager { mainLayout->addSpacing( 10 ); - TQGridLayout* tqlayout = new TQGridLayout( mainLayout, 3, 3 ); - tqlayout->setSpacing( 5 ); + TQGridLayout* layout = new TQGridLayout( mainLayout, 3, 3 ); + layout->setSpacing( 5 ); label = new TQLabel(i18n("Type"), this); - tqlayout->addWidget( label, 0, 0); + layout->addWidget( label, 0, 0); m_serverLabel = new TQLabel(i18n("Server"), this); - tqlayout->addWidget( m_serverLabel, 0, 1); + layout->addWidget( m_serverLabel, 0, 1); label = new TQLabel(i18n("Path"), this); - tqlayout->addWidget( label, 0, 2 ); + layout->addWidget( label, 0, 2 ); m_protocolCombo = new TQComboBox( this ); - tqlayout->addWidget(m_protocolCombo, 1, 0); + layout->addWidget(m_protocolCombo, 1, 0); m_protocolCombo->insertItem( PROTO_FTP ); m_protocolCombo->insertItem( PROTO_FILE ); m_serverEdit = new TQLineEdit( this ); - tqlayout->addWidget( m_serverEdit, 1, 1 ); + layout->addWidget( m_serverEdit, 1, 1 ); m_serverEdit->setText("ftp.crosswire.org"); m_pathEdit = new TQLineEdit( this ); - tqlayout->addWidget( m_pathEdit, 1, 2 ); + layout->addWidget( m_pathEdit, 1, 2 ); m_pathEdit->setText("/pub/sword/raw"); mainLayout->addSpacing( 10 ); diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp index bc3aad9..9278455 100644 --- a/bibletime/frontend/display/cdisplay.cpp +++ b/bibletime/frontend/display/cdisplay.cpp @@ -139,7 +139,7 @@ CDisplay::~CDisplay() { const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part ) { const TQString content = text(format, part); - TQClipboard* cb = KApplication::tqclipboard(); + TQClipboard* cb = KApplication::clipboard(); cb->setText(content); return true; } diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp index a728f67..3d1a50e 100644 --- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp +++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp @@ -38,11 +38,11 @@ m_key(dynamic_cast(key)) { m_key = 0; return; } - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->setDirection( TQBoxLayout::LeftToRight ); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->setDirection( TQBoxLayout::LeftToRight ); w_ref = new CKeyReferenceWidget(dynamic_cast(m_modules.first()), m_key, this); - tqlayout->addWidget(w_ref); + layout->addWidget(w_ref); connect(w_ref,TQT_SIGNAL(changed(CSwordVerseKey *)),TQT_SLOT(refChanged(CSwordVerseKey *))); diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp index a3552a6..5ce4ce3 100644 --- a/bibletime/frontend/keychooser/cbooktreechooser.cpp +++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp @@ -135,10 +135,10 @@ m_key( dynamic_cast(key) ) { } //now setup the keychooser widgets - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); m_treeView = new KListView(this); - tqlayout->addWidget(m_treeView); + layout->addWidget(m_treeView); m_treeView->addColumn("Tree"); m_treeView->header()->hide(); m_treeView->setSorting(-1); diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp index 4b2f306..1e85d6d 100644 --- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp +++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp @@ -37,7 +37,7 @@ m_key(dynamic_cast(key)) { setModules(modules, false); - //we use a tqlayout because the key chooser should be resized to full size + //we use a layout because the key chooser should be resized to full size m_layout = new TQHBoxLayout(this, TQBoxLayout::LeftToRight); m_layout->setResizeMode(TQLayout::FreeResize); diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp index 56c26d7..ab618bc 100644 --- a/bibletime/frontend/keychooser/crefselectdialog.cpp +++ b/bibletime/frontend/keychooser/crefselectdialog.cpp @@ -33,15 +33,15 @@ //{ // m_page = new TQWidget( this ); // m_placeholder = new TQWidget( m_page); -// TQVBoxLayout* tqlayout = new TQVBoxLayout( m_page, 0, spacingHint()); +// TQVBoxLayout* layout = new TQVBoxLayout( m_page, 0, spacingHint()); // m_lineedit = new TQLineEdit( TQString(), m_page, "select" ); // m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8); // -// TQHBoxLayout* htqlayout = new TQHBoxLayout(m_page, 0, spacingHint()); -// htqlayout->addWidget(new TQLabel(i18n("Verse key:"), m_page)); -// htqlayout->addWidget(m_lineedit); -// tqlayout->addItem(htqlayout); -// tqlayout->addWidget(m_placeholder); +// TQHBoxLayout* hlayout = new TQHBoxLayout(m_page, 0, spacingHint()); +// hlayout->addWidget(new TQLabel(i18n("Verse key:"), m_page)); +// hlayout->addWidget(m_lineedit); +// layout->addItem(hlayout); +// layout->addWidget(m_placeholder); // // m_chooser = NULL; // m_oldParent = NULL; diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp index 9b855d5..b93bb80 100644 --- a/bibletime/frontend/manageindicesform.cpp +++ b/bibletime/frontend/manageindicesform.cpp @@ -43,16 +43,16 @@ ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags m_moduleList = new KListView( this, "m_moduleList" ); ManageIndicesFormLayout->addWidget( m_moduleList ); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer1 ); + layout1->addItem( spacer1 ); m_createIndicesButton = new TQPushButton( this, "m_createIndicesButton" ); - tqlayout1->addWidget( m_createIndicesButton ); + layout1->addWidget( m_createIndicesButton ); m_deleteIndicesButton = new TQPushButton( this, "m_deleteIndicesButton" ); - tqlayout1->addWidget( m_deleteIndicesButton ); - ManageIndicesFormLayout->addLayout( tqlayout1 ); + layout1->addWidget( m_deleteIndicesButton ); + ManageIndicesFormLayout->addLayout( layout1 ); languageChange(); resize( TQSize(415, 404).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); diff --git a/bibletime/frontend/manageindicesform.ui b/bibletime/frontend/manageindicesform.ui index b00b5fc..06a6409 100644 --- a/bibletime/frontend/manageindicesform.ui +++ b/bibletime/frontend/manageindicesform.ui @@ -62,7 +62,7 @@ - tqlayout1 + layout1 diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp index b31a363..7b16131 100644 --- a/bibletime/frontend/searchdialog/cmodulechooser.cpp +++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp @@ -283,10 +283,10 @@ void CModuleChooserDialog::initView() { setButtonOKText(i18n("Use chosen work(s)")); TQFrame* page = plainPage(); - TQHBoxLayout* tqlayout = new TQHBoxLayout(page); + TQHBoxLayout* layout = new TQHBoxLayout(page); m_moduleChooser = new CModuleChooser(page); m_moduleChooser->setMinimumSize(320,400); - tqlayout->addWidget(m_moduleChooser); + layout->addWidget(m_moduleChooser); } /** Initializes the connections of this dialog. */ diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp index 7b9bc2f..7b99e9b 100644 --- a/bibletime/frontend/searchdialog/csearchanalysis.cpp +++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp @@ -80,19 +80,19 @@ CSearchAnalysisDialog::~CSearchAnalysisDialog() {} /** Initializes this dialog. */ void CSearchAnalysisDialog::initView() { - TQVBoxLayout* tqlayout = new TQVBoxLayout(plainPage(),0); + TQVBoxLayout* layout = new TQVBoxLayout(plainPage(),0); TQPushButton* button = new TQPushButton(plainPage(), "button"); button->setIconSet(SmallIconSet("filesave")); button->setText(i18n("Save search analysis as HTML")); button->setFixedSize(button->sizeHint()); - tqlayout->addWidget(button); - tqlayout->addSpacing(10); + layout->addWidget(button); + layout->addSpacing(10); m_analysis = new CSearchAnalysis(TQT_TQOBJECT(plainPage())); m_analysisView = new CSearchAnalysisView(m_analysis, plainPage()); m_analysisView->show(); - tqlayout->addWidget(m_analysisView); + layout->addWidget(m_analysisView); connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML())); } diff --git a/bibletime/frontend/searchdialog/searchoptionsform.cpp b/bibletime/frontend/searchdialog/searchoptionsform.cpp index ec317b8..cac251b 100644 --- a/bibletime/frontend/searchdialog/searchoptionsform.cpp +++ b/bibletime/frontend/searchdialog/searchoptionsform.cpp @@ -36,9 +36,9 @@ SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags searchGroupBox = new TQGroupBox( this, "searchGroupBox" ); searchGroupBox->setMargin( 0 ); searchGroupBox->setColumnLayout(0, Qt::Vertical ); - searchGroupBox->tqlayout()->setSpacing( 3 ); - searchGroupBox->tqlayout()->setMargin( 6 ); - searchGroupBoxLayout = new TQGridLayout( searchGroupBox->tqlayout() ); + searchGroupBox->layout()->setSpacing( 3 ); + searchGroupBox->layout()->setMargin( 6 ); + searchGroupBoxLayout = new TQGridLayout( searchGroupBox->layout() ); searchGroupBoxLayout->setAlignment( TQt::AlignTop ); m_searchTextLabel = new TQLabel( searchGroupBox, "m_searchTextLabel" ); -- cgit v1.2.3