summaryrefslogtreecommitdiffstats
path: root/kbabel/kbabel
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r--kbabel/kbabel/CMakeLists.txt2
-rw-r--r--kbabel/kbabel/Makefile.am4
-rw-r--r--kbabel/kbabel/kbabel.cpp2
-rw-r--r--kbabel/kbabel/kbabel.h2
-rw-r--r--kbabel/kbabel/kbabelview.cpp60
-rw-r--r--kbabel/kbabel/kbabelview.h4
-rw-r--r--kbabel/kbabel/kbhighlighting.cpp6
7 files changed, 40 insertions, 40 deletions
diff --git a/kbabel/kbabel/CMakeLists.txt b/kbabel/kbabel/CMakeLists.txt
index 6b263b55..34bb4bc5 100644
--- a/kbabel/kbabel/CMakeLists.txt
+++ b/kbabel/kbabel/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_add_executable( kbabel
main.cpp
LINK
kbabel-static kbabelcommonui-static kbabeldict-static
- kbabelcommon-shared kbabeldictplugin-shared ktexteditor-shared
+ kbabelcommon-shared kbabeldictplugin-shared tdetexteditor-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am
index 3f5fffee..fd67a78d 100644
--- a/kbabel/kbabel/Makefile.am
+++ b/kbabel/kbabel/Makefile.am
@@ -38,14 +38,14 @@ libkbabel_la_SOURCES = kbbookmarkhandler.cpp \
kde_kcfg_DATA=kbabel.kcfg
libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
-libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
kbabel_SOURCES = main.cpp
# the libraries to link against.
kbabel_LDADD = libkbabel.la
-kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
# these are the headers for your project
noinst_HEADERS = kbabel.h kbabelview.h \
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 26f33911..4935f9dd 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -79,7 +79,7 @@
#include <twin.h>
#include <kaction.h>
#include <kstdaction.h>
-#include <kspelldlg.h>
+#include <tdespelldlg.h>
#include <ksqueezedtextlabel.h>
#include <kurldrag.h>
diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h
index b1b63122..3f8dd42b 100644
--- a/kbabel/kbabel/kbabel.h
+++ b/kbabel/kbabel/kbabel.h
@@ -44,7 +44,7 @@
#include <kdockwidget.h>
#include <tqstringlist.h>
#include <tqptrlist.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
#include "kbabelview.h"
#include "kbproject.h"
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 1b8795e2..830d17ce 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -73,7 +73,7 @@
#include <kio/netaccess.h>
#include <knotifyclient.h>
#include <ktempfile.h>
-#include <kspell.h>
+#include <tdespell.h>
#include <twin.h>
#include <kstdaccel.h>
#include <kurldrag.h>
@@ -172,7 +172,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project
spell.posDict.setAutoDelete(true);
spell.active=false;
- spell2.kspell = 0;
+ spell2.tdespell = 0;
spell2.config = 0;
setAcceptDrops(true);
@@ -293,9 +293,9 @@ KBabelView::~KBabelView()
delete _argExtractor;
delete _tagExtractor;
- if( spell2.kspell )
+ if( spell2.tdespell )
{
- spell2.kspell = 0;
+ spell2.tdespell = 0;
delete spell2.config;
spell2.config = 0;
}
@@ -389,7 +389,7 @@ of the currently displayed entry.</p></qt>"));
if( pf < 1 )
pf = 1;
- msgstrEdit = new HidingMsgEdit( pf,this,spell2.kspell,tempWidget,"msgstrEdit");
+ msgstrEdit = new HidingMsgEdit( pf,this,spell2.tdespell,tempWidget,"msgstrEdit");
msgstrEdit->installEventFilter(this);
KCursor::setAutoHideCursor(msgstrEdit,true);
@@ -751,16 +751,16 @@ void KBabelView::readProject(Project::Ptr project)
{
// if there is a spellchecker already, free it
- if( spell2.kspell )
+ if( spell2.tdespell )
{
// ensure the spellchecker is not used anymore
msgstrEdit->setSpellChecker(0L);
// free it
- spell2.kspell->cleanUp();
+ spell2.tdespell->cleanUp();
- delete spell2.kspell;
- spell2.kspell = 0;
+ delete spell2.tdespell;
+ spell2.tdespell = 0;
}
spell2.config = new KSpellConfig(0L, "tempSpellConfig");
@@ -770,18 +770,18 @@ void KBabelView::readProject(Project::Ptr project)
spell2.config->setEncoding(_spellcheckSettings.spellEncoding);
spell2.config->setDictionary(_spellcheckSettings.spellDict);
- spell2.kspell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
+ spell2.tdespell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
spell2.config, false, false);
- if(spell2.kspell->status() == KSpell::Error)
+ if(spell2.tdespell->status() == KSpell::Error)
kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl;
else
{
kdDebug() << "On the fly spellchecker: "
- << spell2.kspell << endl;
- msgstrEdit->setSpellChecker(spell2.kspell);
+ << spell2.tdespell << endl;
+ msgstrEdit->setSpellChecker(spell2.tdespell);
}
- // spell2.kspell->setAutoDelete(true); // let KSpell handle delete
+ // spell2.tdespell->setAutoDelete(true); // let KSpell handle delete
//on-the-fly spellcheck end
}
else
@@ -3942,31 +3942,31 @@ void KBabelView::spellcheck()
spell.active=true;
_dontBeep=true;
- spell.kspell= new KSpell (this, i18n("Spellcheck"),
+ spell.tdespell= new KSpell (this, i18n("Spellcheck"),
TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
- if( spell.kspell->status() == KSpell::Error )
+ if( spell.tdespell->status() == KSpell::Error )
{
KMessageBox::error( this, i18n("KBabel cannot start spell checker. "
"Please check your TDE installation.") );
return;
}
- connect(spell.kspell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone()));
+ connect(spell.tdespell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone()));
- connect(spell.kspell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &
+ connect(spell.tdespell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &
, unsigned int)), this
, TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int)));
- connect(spell.kspell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int))
+ connect(spell.tdespell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int))
, this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int)));
- connect(spell.kspell,TQT_SIGNAL(ignoreall(const TQString &))
+ connect(spell.tdespell,TQT_SIGNAL(ignoreall(const TQString &))
, this, TQT_SLOT(spellAddIgnore(const TQString &)));
- connect(spell.kspell, TQT_SIGNAL(done(bool))
+ connect(spell.tdespell, TQT_SIGNAL(done(bool))
, this, TQT_SLOT(spellResult(bool)));
- spell.kspell->setAutoDelete(true); // let KSpell handle delete
+ spell.tdespell->setAutoDelete(true); // let KSpell handle delete
}
else
{
@@ -4034,14 +4034,14 @@ void KBabelView::spellStart(KSpell *)
kapp->processEvents(100);
}
- spell.kspell->ignore(*it);
+ spell.tdespell->ignore(*it);
}
emit signalClearProgressBar();
}
}
- spell.kspell->checkList(&spell.wordList);
+ spell.tdespell->checkList(&spell.wordList);
}
@@ -4364,8 +4364,8 @@ void KBabelView::spellResult(bool flag)
undo();
}
- int s=spell.kspell->dlgResult();
- spell.kspell->cleanUp();
+ int s=spell.tdespell->dlgResult();
+ spell.tdespell->cleanUp();
emit signalSpellcheckDone(s);
TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct()));
@@ -4377,9 +4377,9 @@ void KBabelView::spellCleanDone()
kdDebug(KBABEL) << "spellCleanDone" << endl;
// if the pointer is cleared, you have finished correcly
- if( !spell.kspell ) return;
+ if( !spell.tdespell ) return;
- KSpell::spellStatus status = spell.kspell->status();
+ KSpell::spellStatus status = spell.tdespell->status();
if(status == KSpell::Error || status == KSpell::Crashed)
{
@@ -4401,8 +4401,8 @@ void KBabelView::spellCleanDone()
void KBabelView::cleanUpSpellStruct()
{
kdDebug(KBABEL) << "Cleaning structure" << endl;
- // spell.kspell is set to be autodeleted
- spell.kspell = 0;
+ // spell.tdespell is set to be autodeleted
+ spell.tdespell = 0;
delete spell.config;
spell.config=0;
spell.wordList.clear();
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 5e9c280a..6af2da00 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -623,7 +623,7 @@ private:
struct
{
- KSpell *kspell;
+ KSpell *tdespell;
KSpellConfig* config;
TQStringList wordList;
bool active;
@@ -648,7 +648,7 @@ private:
} spell;
struct {
- KSpell *kspell;
+ KSpell *tdespell;
KSpellConfig* config;
} spell2; // on-the-fly spellchecking
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index deaaf704..0240153d 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -44,7 +44,7 @@
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kbabelsettings.h>
-#include <kspell.h>
+#include <tdespell.h>
#include "kbhighlighting.h"
#include "resources.h"
@@ -255,7 +255,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw)
kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl;
// Normally isMisspelled would look up a dictionary and return
- // true or false, but kspell is asynchronous and slow so things
+ // true or false, but tdespell is asynchronous and slow so things
// get tricky...
// "dict" is used as a cache to store the results of KSpell
@@ -277,7 +277,7 @@ void KBabelHighlighter::slotMisspelling(const TQString & originalword,
kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl;
dict.replace( originalword, NotOkay );
- // this is slow but since kspell is async this will have to do for now
+ // this is slow but since tdespell is async this will have to do for now
highlight();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:27:12 +0000