diff options
Diffstat (limited to 'tdespell2')
27 files changed, 73 insertions, 73 deletions
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..b80c338fb 100644 --- a/tdespell2/backgroundchecker.h +++ b/tdespell2/backgroundchecker.h @@ -46,9 +46,9 @@ namespace KSpell2 * @author Zack Rusin <zack@kde.org> * @short class used for spell checking in the background */ - class KDE_EXPORT BackgroundChecker : public TQObject + class TDE_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.h b/tdespell2/broker.h index f4029c487..3bd0ba46f 100644 --- a/tdespell2/broker.h +++ b/tdespell2/broker.h @@ -44,10 +44,10 @@ namespace KSpell2 * KSpell2 class, you can think of it as the kernel or manager * of the KSpell2 architecture. */ - class KDE_EXPORT Broker : public TQObject, + class TDE_EXPORT Broker : public TQObject, public TDEShared { - Q_OBJECT + TQ_OBJECT public: typedef TDESharedPtr<Broker> Ptr; /** diff --git a/tdespell2/client.h b/tdespell2/client.h index 07f6fce6e..ddf54af4b 100644 --- a/tdespell2/client.h +++ b/tdespell2/client.h @@ -37,9 +37,9 @@ namespace KSpell2 * I don't really feel like writting my own KLibFactory * that would load anything else then TQObject derivatives. */ - class KDE_EXPORT Client : public TQObject + class TDE_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/filter.h b/tdespell2/filter.h index ded339841..b2ba00ae5 100644 --- a/tdespell2/filter.h +++ b/tdespell2/filter.h @@ -61,7 +61,7 @@ namespace KSpell2 * @author Zack Rusin <zack@kde.org> * @short used to split text into words */ - class KDE_EXPORT Filter + class TDE_EXPORT Filter { public: static Filter *defaultFilter(); 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/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/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/settings.h b/tdespell2/settings.h index 34590ecb8..1dc29a378 100644 --- a/tdespell2/settings.h +++ b/tdespell2/settings.h @@ -31,7 +31,7 @@ namespace KSpell2 { class Broker; - class KDE_EXPORT Settings + class TDE_EXPORT Settings { public: ~Settings(); 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/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..fa06f10dc 100644 --- a/tdespell2/ui/configwidget.h +++ b/tdespell2/ui/configwidget.h @@ -27,9 +27,9 @@ namespace KSpell2 { class Broker; - class KDE_EXPORT ConfigWidget : public TQWidget + class TDE_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 d07ddacce..a3f20e4eb 100644 --- a/tdespell2/ui/dialog.h +++ b/tdespell2/ui/dialog.h @@ -27,9 +27,9 @@ namespace KSpell2 { class Filter; class BackgroundChecker; - class KDE_EXPORT Dialog : public KDialogBase + class TDE_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 ); } } }*/ |