diff options
Diffstat (limited to 'tdespell2/ui')
| -rw-r--r-- | tdespell2/ui/Makefile.am | 2 | ||||
| -rw-r--r-- | tdespell2/ui/configdialog.h | 2 | ||||
| -rw-r--r-- | tdespell2/ui/configui.ui | 8 | ||||
| -rw-r--r-- | tdespell2/ui/configwidget.cpp | 2 | ||||
| -rw-r--r-- | tdespell2/ui/configwidget.h | 4 | ||||
| -rw-r--r-- | tdespell2/ui/dialog.cpp | 60 | ||||
| -rw-r--r-- | tdespell2/ui/dialog.h | 5 | ||||
| -rw-r--r-- | tdespell2/ui/highlighter.cpp | 8 | 
8 files changed, 43 insertions, 48 deletions
| 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..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 2c5606804..a3f20e4eb 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   * @@ -28,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 );          }      }  }*/ | 
