diff options
Diffstat (limited to 'tdespell2')
57 files changed, 117 insertions, 208 deletions
diff --git a/tdespell2/CMakeL10n.txt b/tdespell2/CMakeL10n.txt new file mode 100644 index 000000000..0b9791413 --- /dev/null +++ b/tdespell2/CMakeL10n.txt @@ -0,0 +1,7 @@ +##### create translation templates ############## + +tde_l10n_create_template( + CATALOG "desktop_files/tdespell2-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tdespell2/CMakeLists.txt b/tdespell2/CMakeLists.txt index 01b910862..6e5d2eafe 100644 --- a/tdespell2/CMakeLists.txt +++ b/tdespell2/CMakeLists.txt @@ -40,7 +40,11 @@ install( FILES ##### other data ################################ -install( FILES tdespellclient.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdespellclient.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR tdespell2-desktops +) #### tdespell2base ################################ diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am index 455b1f5c5..6e6549f5b 100644 --- a/tdespell2/Makefile.am +++ b/tdespell2/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libtdespell2base.la -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes) tdespell2baseincludedir = $(includedir)/tdespell2 diff --git a/tdespell2/README b/tdespell2/README index 53d6f4e27..bca8de6a4 100644 --- a/tdespell2/README +++ b/tdespell2/README @@ -52,7 +52,7 @@ Broker::Ptr broker = Broker::openBroker( someKSettingsObject ); Dictionary *enDict = broker->dictionary( "en_US" ); Dictionary *deDict = broker->dictionary( "de_DE" ); -void someFunc( const QString& word ) +void someFunc( const TQString& word ) { if ( enDict->check( word ) ) { kdDebug()<<"Word \""<<word<<"\" is misspelled." <<endl; diff --git a/tdespell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp index 799edf120..954ad8f64 100644 --- a/tdespell2/backgroundchecker.cpp +++ b/tdespell2/backgroundchecker.cpp @@ -46,10 +46,10 @@ BackgroundChecker::BackgroundChecker( const Broker::Ptr& broker, TQObject* paren //d->thread.setBroker( broker ); d->engine = new BackgroundEngine( this ); d->engine->setBroker( broker ); - connect( d->engine, TQT_SIGNAL(misspelling( const TQString&, int )), - TQT_SIGNAL(misspelling( const TQString&, int )) ); - connect( d->engine, TQT_SIGNAL(done()), - TQT_SLOT(slotEngineDone()) ); + connect( d->engine, TQ_SIGNAL(misspelling( const TQString&, int )), + TQ_SIGNAL(misspelling( const TQString&, int )) ); + connect( d->engine, TQ_SIGNAL(done()), + TQ_SLOT(slotEngineDone()) ); } BackgroundChecker::~BackgroundChecker() diff --git a/tdespell2/backgroundchecker.h b/tdespell2/backgroundchecker.h index 84deea5c8..6f9163b26 100644 --- a/tdespell2/backgroundchecker.h +++ b/tdespell2/backgroundchecker.h @@ -48,7 +48,7 @@ namespace KSpell2 */ class KDE_EXPORT BackgroundChecker : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundChecker( const Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); diff --git a/tdespell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp index 9eafe1b2e..21ab03478 100644 --- a/tdespell2/backgroundengine.cpp +++ b/tdespell2/backgroundengine.cpp @@ -87,7 +87,7 @@ void BackgroundEngine::setFilter( Filter *filter ) void BackgroundEngine::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::stop() @@ -96,7 +96,7 @@ void BackgroundEngine::stop() void BackgroundEngine::continueChecking() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::checkNext() diff --git a/tdespell2/backgroundengine.h b/tdespell2/backgroundengine.h index 9ddbe7289..365d3ebbf 100644 --- a/tdespell2/backgroundengine.h +++ b/tdespell2/backgroundengine.h @@ -33,7 +33,7 @@ namespace KSpell2 class Dictionary; class BackgroundEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundEngine( TQObject *parent ); ~BackgroundEngine(); diff --git a/tdespell2/broker.cpp b/tdespell2/broker.cpp index ef8c07dac..16256f189 100644 --- a/tdespell2/broker.cpp +++ b/tdespell2/broker.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * broker.cpp * diff --git a/tdespell2/broker.h b/tdespell2/broker.h index c41fa2988..2ccc63635 100644 --- a/tdespell2/broker.h +++ b/tdespell2/broker.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * broker.h * @@ -48,7 +47,7 @@ namespace KSpell2 class KDE_EXPORT Broker : public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT public: typedef TDESharedPtr<Broker> Ptr; /** diff --git a/tdespell2/client.cpp b/tdespell2/client.cpp index ae470a77e..f8c3d3556 100644 --- a/tdespell2/client.cpp +++ b/tdespell2/client.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * client.cpp * diff --git a/tdespell2/client.h b/tdespell2/client.h index 9f18f9518..c115b3847 100644 --- a/tdespell2/client.h +++ b/tdespell2/client.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * client.cpp * @@ -40,7 +39,7 @@ namespace KSpell2 */ class KDE_EXPORT Client : public TQObject { - Q_OBJECT + TQ_OBJECT public: Client( TQObject *parent = 0, const char *name=0 ); diff --git a/tdespell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp index 39b80e7cf..d501012fd 100644 --- a/tdespell2/defaultdictionary.cpp +++ b/tdespell2/defaultdictionary.cpp @@ -39,8 +39,8 @@ DefaultDictionary::DefaultDictionary( const TQString& lang, Broker *broker ) d = new Private; d->dict = broker->dictionary(); d->broker = broker; - connect( broker, TQT_SIGNAL(configurationChanged()), - TQT_SLOT(defaultConfigurationChanged()) ); + connect( broker, TQ_SIGNAL(configurationChanged()), + TQ_SLOT(defaultConfigurationChanged()) ); } DefaultDictionary::~DefaultDictionary() diff --git a/tdespell2/defaultdictionary.h b/tdespell2/defaultdictionary.h index 1a0090751..f3ee83339 100644 --- a/tdespell2/defaultdictionary.h +++ b/tdespell2/defaultdictionary.h @@ -32,7 +32,7 @@ namespace KSpell2 class DefaultDictionary : public TQObject, public Dictionary { - Q_OBJECT + TQ_OBJECT public: DefaultDictionary( const TQString& lang, Broker *broker ); ~DefaultDictionary(); diff --git a/tdespell2/dictionary.h b/tdespell2/dictionary.h index b2b6d2f44..a0bbea62b 100644 --- a/tdespell2/dictionary.h +++ b/tdespell2/dictionary.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * dictionary.h * diff --git a/tdespell2/filter.cpp b/tdespell2/filter.cpp index 1604bcae1..745d8f689 100644 --- a/tdespell2/filter.cpp +++ b/tdespell2/filter.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * filter.cpp * diff --git a/tdespell2/filter.h b/tdespell2/filter.h index d8992c0f3..ded339841 100644 --- a/tdespell2/filter.h +++ b/tdespell2/filter.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * filter.h * diff --git a/tdespell2/plugins/CMakeLists.txt b/tdespell2/plugins/CMakeLists.txt index 062d033d2..d7971e4bb 100644 --- a/tdespell2/plugins/CMakeLists.txt +++ b/tdespell2/plugins/CMakeLists.txt @@ -9,12 +9,6 @@ # ################################################# -if( WITH_ASPELL ) - add_subdirectory( aspell ) -endif(WITH_ASPELL) - -if( WITH_HSPELL ) - add_subdirectory( hspell ) -endif(WITH_HSPELL) - -add_subdirectory( ispell ) +tde_conditional_add_subdirectory( WITH_ASPELL aspell ) +tde_conditional_add_subdirectory( WITH_HSPELL hspell ) +tde_conditional_add_subdirectory( WITH_ISPELL ispell ) diff --git a/tdespell2/plugins/aspell/CMakeLists.txt b/tdespell2/plugins/aspell/CMakeLists.txt index 9ae66d01b..7a6d1276b 100644 --- a/tdespell2/plugins/aspell/CMakeLists.txt +++ b/tdespell2/plugins/aspell/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES tdespell_aspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdespell_aspell.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdespell2-desktops +) #### tdespell_aspell ############################## diff --git a/tdespell2/plugins/aspell/tdespell_aspell.desktop b/tdespell2/plugins/aspell/tdespell_aspell.desktop index a4753609d..0103e49c7 100644 --- a/tdespell2/plugins/aspell/tdespell_aspell.desktop +++ b/tdespell2/plugins/aspell/tdespell_aspell.desktop @@ -12,10 +12,3 @@ X-TDE-PluginInfo-Depends= X-TDE-PluginInfo-License=LGPL X-TDE-PluginInfo-EnabledByDefault=true Name=ASpell -Name[bn]=এ-স্পেল -Name[hi]=आ-स्पैल -Name[it]=Aspell -Name[ne]=ए स्पेल -Name[sv]=Aspell -Name[ta]=psதேர்ந்தெடு -Name[te]=ఏస్పెల్ diff --git a/tdespell2/plugins/aspell/tdespell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h index 1384b0242..9a71bfa69 100644 --- a/tdespell2/plugins/aspell/tdespell_aspellclient.h +++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h @@ -33,7 +33,7 @@ using KSpell2::Dictionary; class ASpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: ASpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~ASpellClient(); diff --git a/tdespell2/plugins/hspell/CMakeLists.txt b/tdespell2/plugins/hspell/CMakeLists.txt index 960b54ff4..4a234b274 100644 --- a/tdespell2/plugins/hspell/CMakeLists.txt +++ b/tdespell2/plugins/hspell/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES tdespell_hspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdespell_hspell.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdespell2-desktops +) #### tdespell_hspell ############################## diff --git a/tdespell2/plugins/hspell/tdespell_hspell.desktop b/tdespell2/plugins/hspell/tdespell_hspell.desktop index 9663b81c2..f890a1ad4 100644 --- a/tdespell2/plugins/hspell/tdespell_hspell.desktop +++ b/tdespell2/plugins/hspell/tdespell_hspell.desktop @@ -12,7 +12,3 @@ X-TDE-PluginInfo-Depends= X-TDE-PluginInfo-License=LGPL X-TDE-PluginInfo-EnabledByDefault=true Name=HSpell -Name[bn]=এইচ-স্পেল -Name[ne]=एच स्पेल -Name[sv]=Hspell -Name[te]=హెచ్ స్పెల్ diff --git a/tdespell2/plugins/hspell/tdespell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h index 00a89749e..a18928900 100644 --- a/tdespell2/plugins/hspell/tdespell_hspellclient.h +++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h @@ -37,7 +37,7 @@ using KSpell2::Dictionary; class HSpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: HSpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~HSpellClient(); diff --git a/tdespell2/plugins/ispell/CMakeLists.txt b/tdespell2/plugins/ispell/CMakeLists.txt index 62b12a1a1..ed673137b 100644 --- a/tdespell2/plugins/ispell/CMakeLists.txt +++ b/tdespell2/plugins/ispell/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES tdespell_ispell.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdespell_ispell.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdespell2-desktops +) #### tdespell_ispell ############################## diff --git a/tdespell2/plugins/ispell/correct.cpp b/tdespell2/plugins/ispell/correct.cpp index a417ee777..759aa5965 100644 --- a/tdespell2/plugins/ispell/correct.cpp +++ b/tdespell2/plugins/ispell/correct.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/good.cpp b/tdespell2/plugins/ispell/good.cpp index 42ba79515..cb01548a3 100644 --- a/tdespell2/plugins/ispell/good.cpp +++ b/tdespell2/plugins/ispell/good.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/hash.cpp b/tdespell2/plugins/ispell/hash.cpp index 07693c14f..038f671af 100644 --- a/tdespell2/plugins/ispell/hash.cpp +++ b/tdespell2/plugins/ispell/hash.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/ispell.h b/tdespell2/plugins/ispell/ispell.h index 587defc07..d7e60d658 100644 --- a/tdespell2/plugins/ispell/ispell.h +++ b/tdespell2/plugins/ispell/ispell.h @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp index 387997444..d3dd324d3 100644 --- a/tdespell2/plugins/ispell/ispell_checker.cpp +++ b/tdespell2/plugins/ispell/ispell_checker.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* tdespell2 - adopted from Enchant * Copyright (C) 2003 Dom Lachowicz * Copyright (C) 2004 Zack Rusin <zack@kde.org> @@ -55,6 +54,9 @@ typedef struct str_ispell_map } IspellMap; static const char *ispell_dirs [] = { +#ifdef ISPELL_LIBDIR + ISPELL_LIBDIR, +#else "/usr/" SYSTEM_LIBDIR "/ispell", "/usr/lib/ispell", "/usr/local/" SYSTEM_LIBDIR "/ispell", @@ -62,6 +64,7 @@ static const char *ispell_dirs [] = { "/usr/local/share/ispell", "/usr/share/ispell", "/usr/pkg/lib", +#endif 0 }; static const IspellMap ispell_map [] = { diff --git a/tdespell2/plugins/ispell/ispell_checker.h b/tdespell2/plugins/ispell/ispell_checker.h index 84faa34f9..d70d30082 100644 --- a/tdespell2/plugins/ispell/ispell_checker.h +++ b/tdespell2/plugins/ispell/ispell_checker.h @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* tdespell2 - adopted from Enchant * Copyright (C) 2003 Dom Lachowicz * Copyright (C) 2004 Zack Rusin <zack@kde.org> diff --git a/tdespell2/plugins/ispell/ispell_def.h b/tdespell2/plugins/ispell/ispell_def.h index b3d149c43..f837b1104 100644 --- a/tdespell2/plugins/ispell/ispell_def.h +++ b/tdespell2/plugins/ispell/ispell_def.h @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/lookup.cpp b/tdespell2/plugins/ispell/lookup.cpp index 773cd88cb..7489253da 100644 --- a/tdespell2/plugins/ispell/lookup.cpp +++ b/tdespell2/plugins/ispell/lookup.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* tdespell2 - adopted from enchant * Copyright (C) 2003 Dom Lachowicz * Copyright (C) 2004 Zack Rusin <zack@kde.org> diff --git a/tdespell2/plugins/ispell/makedent.cpp b/tdespell2/plugins/ispell/makedent.cpp index ebe128dd3..5ed72215a 100644 --- a/tdespell2/plugins/ispell/makedent.cpp +++ b/tdespell2/plugins/ispell/makedent.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * @@ -234,7 +233,7 @@ ichar_t * icharcpy P ((ichar_t * out, ichar_t * in)); int icharlen P ((ichar_t * str)); int icharcmp P ((ichar_t * s1, ichar_t * s2)); int icharncmp P ((ichar_t * s1, ichar_t * s2, int n)); -#endif /* ICHAR_IS_CHAR */ +#endif /*static int has_marker;*/ @@ -344,7 +343,7 @@ int ISpellChecker::addvheader ( struct dent *dp) dp->flagfield |= (ALLCAPS | MOREVARIANTS); return 0; } -#endif /* NO_CAPITALIZATION_SUPPORT */ +#endif /* ** Combine and resolve the entries describing two capitalizations of the same @@ -501,7 +500,7 @@ ISpellChecker::stringcharlen (char *bufp, int canonical) #ifdef SLOWMULTIPLY static char * sp[MAXSTRINGCHARS]; static int inited = 0; -#endif /* SLOWMULTIPLY */ +#endif char * bufcur; char * stringcur; int stringno; @@ -516,7 +515,7 @@ ISpellChecker::stringcharlen (char *bufp, int canonical) for (stringno = 0; stringno < MAXSTRINGCHARS; stringno++) sp[stringno] = &hashheader.stringchars[stringno][0]; } -#endif /* SLOWMULTIPLY */ +#endif lowstringno = 0; highstringno = m_hashheader.nstrchars - 1; dupwanted = canonical ? 0 : m_defdupchar; @@ -525,17 +524,17 @@ ISpellChecker::stringcharlen (char *bufp, int canonical) stringno = (lowstringno + highstringno) >> 1; #ifdef SLOWMULTIPLY stringcur = sp[stringno]; -#else /* SLOWMULTIPLY */ +#else stringcur = &m_hashheader.stringchars[stringno][0]; -#endif /* SLOWMULTIPLY */ +#endif bufcur = bufp; while (*stringcur) { #ifdef NO8BIT if (((*bufcur++ ^ *stringcur) & 0x7F) != 0) -#else /* NO8BIT */ +#else if (*bufcur++ != *stringcur) -#endif /* NO8BIT */ +#endif break; /* ** We can't use autoincrement above because of the @@ -551,9 +550,9 @@ ISpellChecker::stringcharlen (char *bufp, int canonical) m_laststringch = m_hashheader.stringdups[stringno]; #ifdef SLOWMULTIPLY return stringcur - sp[stringno]; -#else /* SLOWMULTIPLY */ +#else return stringcur - &m_hashheader.stringchars[stringno][0]; -#endif /* SLOWMULTIPLY */ +#endif } else --stringcur; @@ -564,12 +563,12 @@ ISpellChecker::stringcharlen (char *bufp, int canonical) highstringno = stringno - 1; else if ((*bufcur & 0x7F) > (*stringcur & 0x7F)) lowstringno = stringno + 1; -#else /* NO8BIT */ +#else if (*--bufcur < *stringcur) highstringno = stringno - 1; else if (*bufcur > *stringcur) lowstringno = stringno + 1; -#endif /* NO8BIT */ +#endif else if (dupwanted < m_hashheader.dupnos[stringno]) highstringno = stringno - 1; else @@ -847,7 +846,7 @@ icharncmp (ichar_t *s1, ichar_t *s2, int n) return *s1 - *s2; } -#endif /* ICHAR_IS_CHAR */ +#endif /* * \param istate diff --git a/tdespell2/plugins/ispell/msgs.h b/tdespell2/plugins/ispell/msgs.h index e3f30220c..4e4bc1265 100644 --- a/tdespell2/plugins/ispell/msgs.h +++ b/tdespell2/plugins/ispell/msgs.h @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/sp_spell.h b/tdespell2/plugins/ispell/sp_spell.h index 9e1d7b903..1539716e2 100644 --- a/tdespell2/plugins/ispell/sp_spell.h +++ b/tdespell2/plugins/ispell/sp_spell.h @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/plugins/ispell/tdespell_ispell.desktop b/tdespell2/plugins/ispell/tdespell_ispell.desktop index 8042d6708..be95ac1a3 100644 --- a/tdespell2/plugins/ispell/tdespell_ispell.desktop +++ b/tdespell2/plugins/ispell/tdespell_ispell.desktop @@ -12,11 +12,3 @@ X-TDE-PluginInfo-Depends= X-TDE-PluginInfo-License=LGPL X-TDE-PluginInfo-EnabledByDefault=true Name=ISpell -Name[bn]=আই-স্পেল -Name[hi]=आई-स्पैल -Name[it]=Ispell -Name[ne]=आई स्पेल -Name[sv]=Ispell -Name[ta]=psதேர்ந்தெடு -Name[te]=ఐస్పెల్ -Name[tg]=psselect diff --git a/tdespell2/plugins/ispell/tdespell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h index 7deee7de8..b15453bd3 100644 --- a/tdespell2/plugins/ispell/tdespell_ispellclient.h +++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h @@ -33,7 +33,7 @@ using KSpell2::Dictionary; class ISpellClient : public KSpell2::Client { - Q_OBJECT + TQ_OBJECT public: ISpellClient( TQObject *parent, const char *name, const TQStringList & /* args */ ); ~ISpellClient(); diff --git a/tdespell2/plugins/ispell/tdespell_ispelldict.cpp b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp index 089fabc9d..3e23320ed 100644 --- a/tdespell2/plugins/ispell/tdespell_ispelldict.cpp +++ b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp @@ -1,4 +1,4 @@ -/** +/* * tdespell_aspelldict.cpp * * Copyright (C) 2003 Zack Rusin <zack@kde.org> diff --git a/tdespell2/plugins/ispell/tdespell_ispelldict.h b/tdespell2/plugins/ispell/tdespell_ispelldict.h index 12b628c49..e5ff62f9e 100644 --- a/tdespell2/plugins/ispell/tdespell_ispelldict.h +++ b/tdespell2/plugins/ispell/tdespell_ispelldict.h @@ -1,4 +1,4 @@ -/** +/* * tdespell_ispelldict.h * * Copyright (C) 2003 Zack Rusin <zack@kde.org> diff --git a/tdespell2/plugins/ispell/tgood.cpp b/tdespell2/plugins/ispell/tgood.cpp index 859eee62f..d8ea11c87 100644 --- a/tdespell2/plugins/ispell/tgood.cpp +++ b/tdespell2/plugins/ispell/tgood.cpp @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* enchant * Copyright (C) 2003 Dom Lachowicz * diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp index a23fb062f..888a409a0 100644 --- a/tdespell2/settings.cpp +++ b/tdespell2/settings.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * settings.cpp * diff --git a/tdespell2/settings.h b/tdespell2/settings.h index b1b9569f0..34590ecb8 100644 --- a/tdespell2/settings.h +++ b/tdespell2/settings.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * settings.h * diff --git a/tdespell2/tdespellclient.desktop b/tdespell2/tdespellclient.desktop index a637e7a0f..dc4dbd468 100644 --- a/tdespell2/tdespellclient.desktop +++ b/tdespell2/tdespellclient.desktop @@ -3,70 +3,3 @@ Type=ServiceType X-TDE-ServiceType=KSpell/Client X-TDE-Derived=KPluginInfo Comment=KSpell Client -Comment[af]=KSpel Klient -Comment[be]=Кліент спраўджвання правапісу KSpell -Comment[bg]=Клиент на KSpell -Comment[bn]=কে-স্পেল ক্লায়েন্ট -Comment[br]=Kliant KSpell -Comment[bs]=KSpell klijent -Comment[ca]=Client de KSpell -Comment[cs]=KSpell klient -Comment[csb]=Klient KSpell -Comment[da]=KSpell-klient -Comment[de]=KSpell-Dienstprogramm -Comment[el]=Πελάτης KSpell -Comment[eo]=KSpell-Kliento -Comment[es]=Cliente KSpell -Comment[et]=KSpelli klient -Comment[eu]=KSpell bezeroa -Comment[fa]=کارخواه KSpell -Comment[fi]=KSpell-asiakasohjelma -Comment[fr]=Client KSpell -Comment[fy]=KSpell Klant -Comment[ga]=Cliant KSpell -Comment[gl]=Cliente KSpell -Comment[he]=לקוח KSpell -Comment[hi]=के-स्पैल क्लाएंट -Comment[hr]=KSpell klijent -Comment[hu]=KSpell-kliens -Comment[id]=Klien KSpell -Comment[is]=KSpell biðlarinn -Comment[it]=Client KSpell -Comment[ja]=KSpell クライアント -Comment[ka]=KSpell კლიენტი -Comment[kk]=KSpell клиенті -Comment[lb]=KSpell-Zougrëffsprogramm -Comment[lt]=KSpell klientas -Comment[lv]=KSpell klients -Comment[mk]=KSpell клиент -Comment[ms]=Klien KSpell -Comment[nb]=KSpell-klient -Comment[nds]=KSpell-Deenstprogramm -Comment[ne]=के स्पेल क्लाइन्ट -Comment[nn]=KSpell-klient -Comment[pa]=KSpell ਕਲਾਂਇਟ -Comment[pl]=Klient KSpell -Comment[pt]=Cliente do KSpell -Comment[pt_BR]=Cliente KSpell -Comment[ro]=Client KSpell -Comment[ru]=Клиент KSpell -Comment[rw]=Umukiriya wa KKuvuganyuguti -Comment[se]=KSpell-klienta -Comment[sk]=Klient KSpell -Comment[sl]=Odjemnik KSpell -Comment[sr]=KSpell-ов клијент -Comment[sr@Latn]=KSpell-ov klijent -Comment[sv]=Kspell-klient -Comment[ta]=ஓட்டு எழுத்தாக்கம் -Comment[te]=కెస్పెల్ క్లైట్ -Comment[tg]=Клиенти KSpell -Comment[th]=ไคลเอนท์ของ KSpell -Comment[tr]=KSpell Programcığı -Comment[tt]=KSpell Kliente -Comment[uk]=Клієнт KSpell -Comment[uz]=KSpell klienti -Comment[uz@cyrillic]=KSpell клиенти -Comment[vi]=Ứng dụng khách chính tả KSpell -Comment[wa]=Cliyint KSpell -Comment[zh_CN]=KSpell 客户 -Comment[zh_TW]=KShell 客戶端程式 diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am index fc94843b5..c33439d68 100644 --- a/tdespell2/tests/Makefile.am +++ b/tdespell2/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes) +AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes) METASOURCES = AUTO diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp index 92c7e7792..79ba20331 100644 --- a/tdespell2/tests/backgroundtest.cpp +++ b/tdespell2/tests/backgroundtest.cpp @@ -134,10 +134,10 @@ BackgroundTest::BackgroundTest() : TQObject( 0 ) { m_checker = new BackgroundChecker( Broker::openBroker(), this ); - connect( m_checker, TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( m_checker, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); + connect( m_checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( m_checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); m_len = strlen( text ); m_checker->checkText( text ); m_timer.start(); diff --git a/tdespell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h index 2f08e9ce0..1fb16fd60 100644 --- a/tdespell2/tests/backgroundtest.h +++ b/tdespell2/tests/backgroundtest.h @@ -28,7 +28,7 @@ class BackgroundTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: BackgroundTest(); diff --git a/tdespell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp index d6441bde6..a84aeaf30 100644 --- a/tdespell2/tests/test_dialog.cpp +++ b/tdespell2/tests/test_dialog.cpp @@ -40,8 +40,8 @@ void TestDialog::check( const TQString& buffer ) KSpell2::Dialog *dlg = new KSpell2::Dialog( new BackgroundChecker( Broker::openBroker(), this, "checker" ), 0, "my dialog" ); - connect( dlg, TQT_SIGNAL(done(const TQString&)), - TQT_SLOT(doneChecking(const TQString&)) ); + connect( dlg, TQ_SIGNAL(done(const TQString&)), + TQ_SLOT(doneChecking(const TQString&)) ); dlg->setBuffer( buffer ); dlg->show(); } diff --git a/tdespell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h index e8a6cf970..924c1281b 100644 --- a/tdespell2/tests/test_dialog.h +++ b/tdespell2/tests/test_dialog.h @@ -28,7 +28,7 @@ class TestDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestDialog(); diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am index a2d3757d3..42837ec1f 100644 --- a/tdespell2/ui/Makefile.am +++ b/tdespell2/ui/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la # Put most of the code in a noinst lib, for the unit tests to be able to use internal classes. noinst_LTLIBRARIES = libtdespell2_noinst.la -KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT +KDE_CXXFLAGS = -DKDE_NO_COMPAT INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes) tdespell2includedir = $(includedir)/tdespell2 diff --git a/tdespell2/ui/configdialog.h b/tdespell2/ui/configdialog.h index 43a785490..4147c2f84 100644 --- a/tdespell2/ui/configdialog.h +++ b/tdespell2/ui/configdialog.h @@ -28,7 +28,7 @@ namespace KSpell2 class Broker; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog( Broker *broker, TQWidget *parent ); diff --git a/tdespell2/ui/configui.ui b/tdespell2/ui/configui.ui index 94b0061cd..6fe99759a 100644 --- a/tdespell2/ui/configui.ui +++ b/tdespell2/ui/configui.ui @@ -102,13 +102,9 @@ <customwidgets> </customwidgets> <includes> - <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp index 2317f7307..8efaddb04 100644 --- a/tdespell2/ui/configwidget.cpp +++ b/tdespell2/ui/configwidget.cpp @@ -71,7 +71,7 @@ void ConfigWidget::init( Broker *broker ) d->ui->m_ignoreListBox->insertStringList( ignoreList ); d->ui->m_bgSpellCB->setChecked( d->broker->settings()->backgroundCheckerEnabled() ); d->ui->m_bgSpellCB->hide();//hidden by default - connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( d->ui->m_ignoreListBox, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); layout->addWidget( d->ui ); } diff --git a/tdespell2/ui/configwidget.h b/tdespell2/ui/configwidget.h index 2f65ed20e..071e83272 100644 --- a/tdespell2/ui/configwidget.h +++ b/tdespell2/ui/configwidget.h @@ -29,7 +29,7 @@ namespace KSpell2 class Broker; class KDE_EXPORT ConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigWidget( Broker *broker, TQWidget *parent, const char *name =0 ); ~ConfigWidget(); diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp index 0c45f3cd1..9eb592a5c 100644 --- a/tdespell2/ui/dialog.cpp +++ b/tdespell2/ui/dialog.cpp @@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker, initGui(); initConnections(); - setMainWidget( TQT_TQWIDGET(d->ui) ); + setMainWidget( static_cast<TQWidget*>(d->ui) ); } Dialog::~Dialog() @@ -79,35 +79,35 @@ Dialog::~Dialog() void Dialog::initConnections() { - connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceWord()) ); - connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceAll()) ); - connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkip()) ); - connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkipAll()) ); - connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()), - TQT_SLOT(slotSuggest()) ); - connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotChangeLanguage(const TQString&)) ); - connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SIGNAL(misspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); - connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT( slotReplaceWord() ) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) ); - connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) ); - connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAutocorrect()) ); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddWord()) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceAll()) ); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkip()) ); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkipAll()) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSuggest()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotChangeLanguage(const TQString&)) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SIGNAL(misspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT( slotReplaceWord() ) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(cancelClicked()),this, TQ_SLOT(slotCancel()) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_autoCorrect, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAutocorrect()) ); // button use by kword/kpresenter // hide by default d->ui->m_autoCorrect->hide(); diff --git a/tdespell2/ui/dialog.h b/tdespell2/ui/dialog.h index 2c5606804..a531408bf 100644 --- a/tdespell2/ui/dialog.h +++ b/tdespell2/ui/dialog.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /* * dialog.h * @@ -30,7 +29,7 @@ namespace KSpell2 class BackgroundChecker; class KDE_EXPORT Dialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Dialog( BackgroundChecker *checker, TQWidget *parent, const char *name=0 ); diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 32970f9e4..080737dae 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -87,7 +87,7 @@ int Highlighter::highlightParagraph( const TQString& text, w = d->filter->nextWord(); } } - //TQTimer::singleShot( 0, this, TQT_SLOT(checkWords()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(checkWords()) ); return 0; } @@ -127,12 +127,12 @@ void Highlighter::setCurrentLanguage( const TQString& lang ) void Highlighter::setMisspelled( int start, int count ) { - setFormat( start , count, Qt::red ); + setFormat( start , count, TQt::red ); } void Highlighter::unsetMisspelled( int start, int count ) { - setFormat( start, count, Qt::black ); + setFormat( start, count, TQt::black ); } /* @@ -142,7 +142,7 @@ void Highlighter::checkWords() if ( !w.end ) { if ( !d->dict->check( w.word ) ) { setFormat( w.start, w.word.length(), - Qt::red ); + TQt::red ); } } }*/ |