diff options
Diffstat (limited to 'tdeui/ksconfig.cpp')
| -rw-r--r-- | tdeui/ksconfig.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 6ae9e3d5f..8a43a5e82 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -101,18 +101,18 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, TQGridLayout *glay = new TQGridLayout( this, 6, 3, 0, KDialog::spacingHint() ); cb1 = new TQCheckBox( i18n("Create &root/affix combinations" " not in dictionary"), this, "NoRootAffix" ); - connect( cb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sNoAff(bool)) ); + connect( cb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sNoAff(bool)) ); glay->addMultiCellWidget( cb1, 0, 0, 0, 2 ); cb2 = new TQCheckBox( i18n("Consider run-together &words" " as spelling errors"), this, "RunTogether" ); - connect( cb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sRunTogether(bool)) ); + connect( cb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sRunTogether(bool)) ); glay->addMultiCellWidget( cb2, 1, 1, 0, 2 ); dictcombo = new TQComboBox( this, "DictFromList" ); dictcombo->setInsertionPolicy( TQComboBox::NoInsertion ); - connect( dictcombo, TQT_SIGNAL (activated(int)), - this, TQT_SLOT (sSetDictionary(int)) ); + connect( dictcombo, TQ_SIGNAL (activated(int)), + this, TQ_SLOT (sSetDictionary(int)) ); glay->addMultiCellWidget( dictcombo, 2, 2, 1, 2 ); dictlist = new TQLabel( dictcombo, i18n("&Dictionary:"), this ); @@ -136,8 +136,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, encodingcombo->insertItem( "CP1251" ); encodingcombo->insertItem( "CP1255" ); - connect( encodingcombo, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(sChangeEncoding(int)) ); + connect( encodingcombo, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(sChangeEncoding(int)) ); glay->addMultiCellWidget( encodingcombo, 3, 3, 1, 2 ); TQLabel *tmpQLabel = new TQLabel( encodingcombo, i18n("&Encoding:"), this); @@ -149,8 +149,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, clientcombo->insertItem( i18n("Aspell") ); clientcombo->insertItem( i18n("Hspell") ); clientcombo->insertItem( i18n("Zemberek") ); - connect( clientcombo, TQT_SIGNAL (activated(int)), this, - TQT_SLOT (sChangeClient(int)) ); + connect( clientcombo, TQ_SIGNAL (activated(int)), this, + TQ_SLOT (sChangeClient(int)) ); glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 ); tmpQLabel = new TQLabel( clientcombo, i18n("&Client:"), this ); @@ -159,7 +159,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, if( addHelpButton ) { TQPushButton *pushButton = new KPushButton( KStdGuiItem::help(), this ); - connect( pushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(sHelp()) ); + connect( pushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(sHelp()) ); glay->addWidget(pushButton, 5, 2); } @@ -188,11 +188,7 @@ KSpellConfig::readGlobalSettings() setDictionary ( kc->readEntry("KSpell_Dictionary") ); setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) ); setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) ); -#if defined(__OpenBSD__) || defined(__FreeBSD__) - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ASPELL) ); -#else - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ISPELL) ); -#endif + setClient ( kc->readNumEntry ("KSpell_Client", DEFAULT_SPELL_CHECKER) ); return true; } @@ -603,6 +599,9 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries ) box->insertItem( i18n("ISpell Default") ); // dictionary path +#ifdef ISPELL_LIBDIR + TQFileInfo dir (ISPELL_LIBDIR); +#else TQFileInfo dir ("/usr/lib/ispell"); if (!dir.exists() || !dir.isDir()) dir.setFile ("/usr/local/lib/ispell"); @@ -617,6 +616,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries ) if (!dir.exists() || !dir.isDir()) dir.setFile ("/usr/local/lib"); */ +#endif if (!dir.exists() || !dir.isDir()) return; kdDebug(750) << "KSpellConfig::getAvailDictsIspell " @@ -926,7 +926,7 @@ KSpellConfig::sSetDictionary (int i) { setDictionary (langfnames[i]); setDictFromList (true); - TQTimer::singleShot( 0, this, TQT_SIGNAL( configChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( configChanged() ) ); } void @@ -974,7 +974,7 @@ void KSpellConfig::activateHelp( void ) void KSpellConfig::sHelp( void ) { - kapp->invokeHelp("configuration", "tdespell"); + tdeApp->invokeHelp("configuration", "tdespell"); } /* |