diff options
Diffstat (limited to 'bibletime/frontend/coptionsdialog.cpp')
| -rw-r--r-- | bibletime/frontend/coptionsdialog.cpp | 248 |
1 files changed, 124 insertions, 124 deletions
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp index af01965..cdce01b 100644 --- a/bibletime/frontend/coptionsdialog.cpp +++ b/bibletime/frontend/coptionsdialog.cpp @@ -30,22 +30,22 @@ #include <stdlib.h> //QT includes -#include <qhbox.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qdict.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qhbuttongroup.h> -#include <qradiobutton.h> -#include <qcolor.h> -#include <qtooltip.h> -#include <qwidgetstack.h> - -#include <qstringlist.h> -#include <qinputdialog.h> -#include <qdir.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqdict.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqhbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcolor.h> +#include <tqtooltip.h> +#include <tqwidgetstack.h> + +#include <tqstringlist.h> +#include <tqinputdialog.h> +#include <tqdir.h> //KDE includes #include <kapp.h> @@ -71,8 +71,8 @@ using std::string; using std::list; -COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KActionCollection* actionCollection ) -: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) { +COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection ) +: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString::null, TQString::null, TQString::null) { m_settings.keys.application.actionCollection = actionCollection; setIconListAllVisible(true); @@ -84,17 +84,17 @@ COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KActionCollect } COptionsDialog::~COptionsDialog() { - //the actionCollections objects are deleted by their QWidget parent + //the actionCollections objects are deleted by their TQWidget parent } /** */ -void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont) { +void COptionsDialog::newDisplayWindowFontSelected(const TQFont &newFont) { CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ]; m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) ); } /** Called when the combobox contents is changed */ -void COptionsDialog::newDisplayWindowFontAreaSelected(const QString& usage) { +void COptionsDialog::newDisplayWindowFontAreaSelected(const TQString& usage) { useOwnFontClicked( m_settings.fonts.fontMap[usage].first ); m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[usage].first ); @@ -135,14 +135,14 @@ const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) { /** Initializes the startup section of the OD. */ void COptionsDialog::initDisplay() { - QFrame* page = addPage(i18n("Display"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32)); - QVBoxLayout* layout = new QVBoxLayout(page); + TQFrame* page = addPage(i18n("Display"), TQString::null, DesktopIcon(CResMgr::settings::startup::icon,32)); + TQVBoxLayout* layout = new TQVBoxLayout(page); layout->setSpacing( 5 ); {//daily tips - m_settings.startup.showTips = new QCheckBox(page); + m_settings.startup.showTips = new TQCheckBox(page); m_settings.startup.showTips->setText(i18n("Show tip of the day")); - QToolTip::add + TQToolTip::add (m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::tooltip ); @@ -153,9 +153,9 @@ void COptionsDialog::initDisplay() { layout->addSpacing(5); { //startup logo - m_settings.startup.showLogo = new QCheckBox(page); + m_settings.startup.showLogo = new TQCheckBox(page); m_settings.startup.showLogo->setText(i18n("Show startuplogo")); - QToolTip::add + TQToolTip::add (m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::tooltip); @@ -173,14 +173,14 @@ void COptionsDialog::initDisplay() { layout->addSpacing( 5 ); - QHBoxLayout* hboxlayout = new QHBoxLayout(); + TQHBoxLayout* hboxlayout = new TQHBoxLayout(); - m_settings.displayStyle.styleChooser = new QComboBox( page ); //create first to enable buddy for label - connect( m_settings.displayStyle.styleChooser, SIGNAL( activated( int ) ), - this, SLOT( updateStylePreview() ) ); + 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() ) ); hboxlayout->addWidget( - new QLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) + new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) ); hboxlayout->addWidget( m_settings.displayStyle.styleChooser ); hboxlayout->addStretch(); @@ -188,7 +188,7 @@ void COptionsDialog::initDisplay() { m_settings.displayStyle.stylePreview = new KHTMLPart(page); layout->addWidget( - new QLabel( + new TQLabel( m_settings.displayStyle.stylePreview->view(), i18n("Style preview"), page ) @@ -211,9 +211,9 @@ void COptionsDialog::initDisplay() { /** Init fonts section. */ void COptionsDialog::initLanguages() { - QFrame* page = addPage(i18n("Languages"), QString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32)); - QVBoxLayout* layout = new QVBoxLayout(page,5); - layout->setResizeMode( QLayout::Minimum ); + TQFrame* page = addPage(i18n("Languages"), TQString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32)); + TQVBoxLayout* layout = new TQVBoxLayout(page,5); + layout->setResizeMode( TQLayout::Minimum ); { //Sword locales layout->addWidget( @@ -223,19 +223,19 @@ void COptionsDialog::initLanguages() { create a new locale, see http://www.crosswire.org/sword/develop for details.")) ); - m_settings.fonts.swordLocaleCombo = new QComboBox(page); - QLabel* label = new QLabel(m_settings.fonts.swordLocaleCombo, i18n("Language for names of Bible books"), page); - QToolTip::add + m_settings.fonts.swordLocaleCombo = new TQComboBox(page); + TQLabel* label = new TQLabel(m_settings.fonts.swordLocaleCombo, i18n("Language for names of Bible books"), page); + TQToolTip::add (m_settings.fonts.swordLocaleCombo, CResMgr::settings::sword::general::language::tooltip); - QHBoxLayout* hBoxLayout = new QHBoxLayout(); + TQHBoxLayout* hBoxLayout = new TQHBoxLayout(); hBoxLayout->addWidget(label); hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo); hBoxLayout->addStretch(); layout->addLayout(hBoxLayout); - QStringList languageNames; + TQStringList languageNames; languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() ); // languageNames.append( i18n("English") ); @@ -266,7 +266,7 @@ void COptionsDialog::initLanguages() { (CBTConfig::language) ); - QString currentLanguageName; + TQString currentLanguageName; if ( l->isValid() && languageNames.contains(l->translatedName()) ) { //tranlated language name is in the box currentLanguageName = l->translatedName(); } @@ -276,7 +276,7 @@ void COptionsDialog::initLanguages() { (CBTConfig::language).local8Bit() ); if (locale) { - currentLanguageName = QString::fromLatin1(locale->getDescription()); + currentLanguageName = TQString::fromLatin1(locale->getDescription()); } } @@ -307,10 +307,10 @@ void COptionsDialog::initLanguages() { ) ); layout->addSpacing(5); - QHBoxLayout* hLayout = new QHBoxLayout(); + TQHBoxLayout* hLayout = new TQHBoxLayout(); - m_settings.fonts.usage = new QComboBox(page); - QToolTip::add + m_settings.fonts.usage = new TQComboBox(page); + TQToolTip::add (m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::tooltip); @@ -319,13 +319,13 @@ void COptionsDialog::initLanguages() { CLanguageMgr::LangMap langMap = languageMgr()->availableLanguages(); for ( CLanguageMgr::LangMapIterator it( langMap ); it.current(); ++it ) { - const QString name = it.current()->translatedName().isEmpty() ? + const TQString name = it.current()->translatedName().isEmpty() ? it.current()->abbrev() : it.current()->translatedName(); m_settings.fonts.fontMap.insert(name, CBTConfig::get (it.current()) ); } - for( QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { + for( TQMap<TQString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { if ( m_settings.fonts.fontMap[it.key()].first ) { //show font icon m_settings.fonts.usage->insertItem(SmallIcon("fonts"), it.key() ); } @@ -334,19 +334,19 @@ void COptionsDialog::initLanguages() { } } - m_settings.fonts.useOwnFontBox = new QCheckBox(i18n("Use custom font"), page, "font checkbox"); - connect(m_settings.fonts.useOwnFontBox, SIGNAL(toggled(bool)), SLOT(useOwnFontClicked(bool))); + m_settings.fonts.useOwnFontBox = new TQCheckBox(i18n("Use custom font"), page, "font checkbox"); + connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool))); hLayout->addWidget(m_settings.fonts.useOwnFontBox); layout->addLayout(hLayout); //#warning TODO: remember the last selected font and jump there. - m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, QStringList(), true, 5); + 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.")); layout->addWidget(m_settings.fonts.fontChooser); - connect(m_settings.fonts.fontChooser, SIGNAL(fontSelected(const QFont&)), SLOT(newDisplayWindowFontSelected(const QFont&))); - connect(m_settings.fonts.usage, SIGNAL(activated(const QString&)), SLOT(newDisplayWindowFontAreaSelected(const QString&))); + 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&))); m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second ); useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first ); @@ -358,21 +358,21 @@ void COptionsDialog::initLanguages() { /** Init accel key section. */ void COptionsDialog::initAccelerators() { - QVBox* page = addVBoxPage(i18n("HotKeys"), QString::null, DesktopIcon(CResMgr::settings::keys::icon,32)); + TQVBox* page = addVBoxPage(i18n("HotKeys"), TQString::null, DesktopIcon(CResMgr::settings::keys::icon,32)); CBTConfig::setupAccelSettings( CBTConfig::application, m_settings.keys.application.actionCollection ); - QHBox* hbox = new QHBox(page); - QLabel* label = new QLabel(i18n("Choose type:"), hbox); - m_settings.keys.typeChooser = new QComboBox(hbox); + TQHBox* hbox = new TQHBox(page); + TQLabel* label = new TQLabel(i18n("Choose type:"), hbox); + m_settings.keys.typeChooser = new TQComboBox(hbox); connect( - m_settings.keys.typeChooser, SIGNAL(activated(const QString&)), - SLOT(slotKeyChooserTypeChanged(const QString&)) + m_settings.keys.typeChooser, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(slotKeyChooserTypeChanged(const TQString&)) ); - QLabel* dummy = new QLabel( hbox ); // empty label for stretch + TQLabel* dummy = new TQLabel( hbox ); // empty label for stretch hbox->setStretchFactor(label, 0); hbox->setStretchFactor(m_settings.keys.typeChooser, 0); @@ -380,7 +380,7 @@ void COptionsDialog::initAccelerators() { page->setStretchFactor(hbox, 0); - m_settings.keys.keyChooserStack = new QWidgetStack(page); + m_settings.keys.keyChooserStack = new TQWidgetStack(page); Q_ASSERT(m_settings.keys.keyChooserStack); page->setStretchFactor(m_settings.keys.keyChooserStack, 5); @@ -455,14 +455,14 @@ void COptionsDialog::initAccelerators() { /** Init Sword section. */ void COptionsDialog::initSword() { - QVBox* page = addVBoxPage(i18n("Desk"),QString::null, DesktopIcon(CResMgr::settings::sword::icon,32)); + TQVBox* page = addVBoxPage(i18n("Desk"),TQString::null, DesktopIcon(CResMgr::settings::sword::icon,32)); KTabCtl* tabCtl = new KTabCtl(page); { //Standard works - QFrame* currentTab = new QFrame(tabCtl); + TQFrame* currentTab = new TQFrame(tabCtl); tabCtl->addTab(currentTab, i18n("Standard works")); - QGridLayout* gridLayout = new QGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space - gridLayout->setResizeMode(QLayout::Minimum); + TQGridLayout* gridLayout = new TQGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space + gridLayout->setResizeMode(TQLayout::Minimum); gridLayout->addMultiCellWidget( CToolClass::explanationLabel(currentTab, i18n("Standard works"), @@ -471,73 +471,73 @@ void COptionsDialog::initSword() { 0,0,0,-1 /*fill the horizontal space*/ ); - m_settings.swords.standardBible = new QComboBox(currentTab); - QLabel* label = new QLabel(m_settings.swords.standardBible, i18n("Standard Bible"), currentTab); + m_settings.swords.standardBible = new TQComboBox(currentTab); + TQLabel* label = new TQLabel(m_settings.swords.standardBible, i18n("Standard Bible"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::tooltip); gridLayout->addWidget(label,1,0); gridLayout->addWidget(m_settings.swords.standardBible,1,1); - m_settings.swords.standardCommentary = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardCommentary, i18n("Standard Commentary"), currentTab); + m_settings.swords.standardCommentary = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardCommentary, i18n("Standard Commentary"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::tooltip); gridLayout->addWidget(label,2,0); gridLayout->addWidget(m_settings.swords.standardCommentary,2,1); - m_settings.swords.standardLexicon = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardLexicon, i18n("Standard Lexicon"), currentTab); + m_settings.swords.standardLexicon = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardLexicon, i18n("Standard Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::tooltip); gridLayout->addWidget(label,3,0); gridLayout->addWidget(m_settings.swords.standardLexicon,3,1); - m_settings.swords.standardDailyDevotional = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardDailyDevotional, i18n("Standard Daily Devotional"), currentTab); + m_settings.swords.standardDailyDevotional = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardDailyDevotional, i18n("Standard Daily Devotional"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::tooltip); gridLayout->addWidget(label,4,0); gridLayout->addWidget(m_settings.swords.standardDailyDevotional,4,1); - m_settings.swords.standardHebrewStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewStrong, i18n("Standard Hebrew Strong's Lexicon"), currentTab); + m_settings.swords.standardHebrewStrong = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardHebrewStrong, i18n("Standard Hebrew Strong's Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::tooltip); gridLayout->addWidget(label,5,0); gridLayout->addWidget(m_settings.swords.standardHebrewStrong,5,1); - m_settings.swords.standardGreekStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekStrong, i18n("Standard Greek Strong's Lexicon"), currentTab); + m_settings.swords.standardGreekStrong = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardGreekStrong, i18n("Standard Greek Strong's Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::tooltip); gridLayout->addWidget(label,6,0); gridLayout->addWidget(m_settings.swords.standardGreekStrong,6,1); - m_settings.swords.standardHebrewMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewMorph, i18n("Standard Hebrew Morphological Lexicon"), currentTab); - QToolTip::add + m_settings.swords.standardHebrewMorph = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardHebrewMorph, i18n("Standard Hebrew Morphological Lexicon"), currentTab); + TQToolTip::add (m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::tooltip); gridLayout->addWidget(label,7,0); gridLayout->addWidget(m_settings.swords.standardHebrewMorph,7,1); - m_settings.swords.standardGreekMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekMorph, i18n("Standard Greek Morphological Lexicon"), currentTab); + m_settings.swords.standardGreekMorph = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardGreekMorph, i18n("Standard Greek Morphological Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::tooltip); gridLayout->addWidget(label,8,0); @@ -547,7 +547,7 @@ void COptionsDialog::initSword() { //fill the comboboxes with the right modules ListCSwordModuleInfo& modules = backend()->moduleList(); - QString modDescript; + TQString modDescript; ListCSwordModuleInfo::iterator end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { modDescript = (*it)->config(CSwordModuleInfo::Description); @@ -594,9 +594,9 @@ void COptionsDialog::initSword() { } //using two lists and one loop is better than six loops with almost the same code :) - QPtrList<QComboBox> comboList; + TQPtrList<TQComboBox> comboList; comboList.setAutoDelete(false);//don't delete the combos accidentally - QStringList moduleList; + TQStringList moduleList; for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { //fill the combobox list in the right order (i.e. same order as the CBTConfig::module enum list) @@ -635,14 +635,14 @@ void COptionsDialog::initSword() { moduleList << m->config(CSwordModuleInfo::Description); } else { - moduleList << QString::null; + moduleList << TQString::null; } } - QString module = QString::null; + TQString module = TQString::null; int item = 0; int count = 0; - for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() ) { + for (TQComboBox* combo = comboList.first(); combo; combo = comboList.next() ) { module = moduleList[comboList.at()]; count = combo->count(); combo->setMaximumWidth(300); @@ -656,9 +656,9 @@ void COptionsDialog::initSword() { } } { // ---------- new tab: filters -------- // - QFrame* currentTab = new QFrame(tabCtl); + TQFrame* currentTab = new TQFrame(tabCtl); tabCtl->addTab(currentTab, i18n("Text filters")); - QVBoxLayout* layout = new QVBoxLayout(currentTab,5); + TQVBoxLayout* layout = new TQVBoxLayout(currentTab,5); layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"), i18n("Filters control the appearance of text. \ @@ -667,56 +667,56 @@ You can change the filter settings in each display window, of course.")) ); layout->addSpacing(5); - m_settings.swords.lineBreaks = new QCheckBox(currentTab); + 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)); layout->addWidget(m_settings.swords.lineBreaks); - m_settings.swords.verseNumbers = new QCheckBox(currentTab); + 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)); layout->addWidget(m_settings.swords.verseNumbers); - m_settings.swords.headings = new QCheckBox(currentTab); + m_settings.swords.headings = new TQCheckBox(currentTab); m_settings.swords.headings->setText(i18n("Show section headings")); m_settings.swords.headings->setChecked(CBTConfig::get (CBTConfig::headings)); layout->addWidget(m_settings.swords.headings); - m_settings.swords.scriptureReferences = new QCheckBox(currentTab); + m_settings.swords.scriptureReferences = new TQCheckBox(currentTab); m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references")); m_settings.swords.scriptureReferences->setChecked(CBTConfig::get (CBTConfig::scriptureReferences)); layout->addWidget(m_settings.swords.scriptureReferences); - m_settings.swords.greekAccents = new QCheckBox(currentTab); + 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)); layout->addWidget(m_settings.swords.greekAccents); - m_settings.swords.hebrewPoints = new QCheckBox(currentTab); + m_settings.swords.hebrewPoints = new TQCheckBox(currentTab); m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points")); m_settings.swords.hebrewPoints->setChecked(CBTConfig::get (CBTConfig::hebrewPoints)); layout->addWidget(m_settings.swords.hebrewPoints); - m_settings.swords.hebrewCantillation = new QCheckBox(currentTab); + m_settings.swords.hebrewCantillation = new TQCheckBox(currentTab); m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks")); m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get (CBTConfig::hebrewCantillation)); layout->addWidget(m_settings.swords.hebrewCantillation); - m_settings.swords.morphSegmentation = new QCheckBox(currentTab); + m_settings.swords.morphSegmentation = new TQCheckBox(currentTab); m_settings.swords.morphSegmentation->setText(i18n("Show morph segmentation")); m_settings.swords.morphSegmentation->setChecked(CBTConfig::get (CBTConfig::morphSegmentation)); layout->addWidget(m_settings.swords.morphSegmentation); - m_settings.swords.textualVariants = new QCheckBox(currentTab); + 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)); @@ -775,7 +775,7 @@ void COptionsDialog::saveAccelerators() { /** No descriptions */ void COptionsDialog::saveLanguages() { - for(QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { + for(TQMap<TQString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { const CLanguageMgr::Language* const lang = languageMgr()->languageForTranslatedName(it.key()); if (!lang->isValid()) { //we probably use a language, for which we have only the abbrev CLanguageMgr::Language l(it.key(), it.key(), it.key()); //create a temp language @@ -800,7 +800,7 @@ void COptionsDialog::saveDisplay() { /** No descriptions */ void COptionsDialog::saveSword() { for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { - QString moduleDescription = QString::null; + TQString moduleDescription = TQString::null; CBTConfig::modules moduleType = (CBTConfig::modules)(i); switch (moduleType) { @@ -838,9 +838,9 @@ void COptionsDialog::saveSword() { } - QString languageAbbrev; + TQString languageAbbrev; - const QString currentLanguageName = m_settings.fonts.swordLocaleCombo->currentText(); + const TQString currentLanguageName = m_settings.fonts.swordLocaleCombo->currentText(); const CLanguageMgr::Language* const l = CPointers::languageMgr()->languageForTranslatedName( currentLanguageName ); if (l && l->isValid()) { @@ -853,8 +853,8 @@ void COptionsDialog::saveSword() { SWLocale* locale = LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str()); Q_ASSERT(locale); - if ( locale && (QString::fromLatin1(locale->getDescription()) == currentLanguageName) ) { - languageAbbrev = QString::fromLatin1(locale->getName()); //we found the abbrevation for the current language + if ( locale && (TQString::fromLatin1(locale->getDescription()) == currentLanguageName) ) { + languageAbbrev = TQString::fromLatin1(locale->getName()); //we found the abbrevation for the current language break; } } @@ -913,7 +913,7 @@ void COptionsDialog::updateStylePreview() { //update the style preview widget using namespace Rendering; - const QString styleName = m_settings.displayStyle.styleChooser->currentText(); + const TQString styleName = m_settings.displayStyle.styleChooser->currentText(); CTextRendering::KeyTree tree; @@ -921,40 +921,40 @@ void COptionsDialog::updateStylePreview() { settings.highlight = false; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1") .arg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1") .arg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")), settings)); settings.highlight = true; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1") .arg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")), settings) ); settings.highlight = false; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1") .arg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>") + TQString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>") .arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1") .arg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")), settings)); - const QString oldStyleName = CBTConfig::get + const TQString oldStyleName = CBTConfig::get (CBTConfig::displayStyle); CBTConfig::set (CBTConfig::displayStyle, styleName); @@ -968,9 +968,9 @@ void COptionsDialog::updateStylePreview() { (CBTConfig::displayStyle, oldStyleName); } -void COptionsDialog::slotKeyChooserTypeChanged(const QString& title) { +void COptionsDialog::slotKeyChooserTypeChanged(const TQString& title) { //delete all KKeyChoosers which may not share accels, because this class checks in all instances for key conflicts - typedef QPtrList<KKeyChooser> KeyChooserList; + typedef TQPtrList<KKeyChooser> KeyChooserList; KeyChooserList list; list.append(m_settings.keys.bible.keyChooser); list.append(m_settings.keys.commentary.keyChooser); @@ -985,11 +985,11 @@ void COptionsDialog::slotKeyChooserTypeChanged(const QString& title) { } } #else - //Normally we know a QPtrListIterator is done when it.current() == 0 + //Normally we know a TQPtrListIterator is done when it.current() == 0 //but now a value can actually be zero, which would be //indistinguishable from the end condition. //Therefore, more complex logic is needed. - QPtrListIterator<KKeyChooser> it(list); + TQPtrListIterator<KKeyChooser> it(list); if (!it.isEmpty()){ while (!it.atLast()){ if (it.current()){ |