summaryrefslogtreecommitdiffstats
path: root/kiten
diff options
context:
space:
mode:
Diffstat (limited to 'kiten')
-rw-r--r--kiten/asyndeta.cpp4
-rw-r--r--kiten/deinf.cpp2
-rw-r--r--kiten/dict.cpp6
-rw-r--r--kiten/kiten.cpp12
-rw-r--r--kiten/kiten.h4
-rw-r--r--kiten/kromajiedit.cpp2
-rw-r--r--kiten/rad.cpp2
-rw-r--r--kiten/widgets.cpp6
8 files changed, 19 insertions, 19 deletions
diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp
index 4a377eb0..46bcb9fa 100644
--- a/kiten/asyndeta.cpp
+++ b/kiten/asyndeta.cpp
@@ -59,7 +59,7 @@ Dict::Index *Asyndeta::retrieveIndex()
void Asyndeta::readKitenConfiguration()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
KConfig config(dirs->findResource("config", "kitenrc"));
TQString globaledict = dirs->findResource("data", "kiten/edict");
@@ -113,6 +113,6 @@ void Asyndeta::readKitenConfiguration()
TQString Asyndeta::personalDictionaryLocation()
{
- return KGlobal::dirs()->saveLocation("data", "kiten/dictionaries/", true).append("personal");
+ return TDEGlobal::dirs()->saveLocation("data", "kiten/dictionaries/", true).append("personal");
}
diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp
index 52d1f8f2..e92fcd1d 100644
--- a/kiten/deinf.cpp
+++ b/kiten/deinf.cpp
@@ -37,7 +37,7 @@ void Deinf::Index::load()
if (loaded)
return;
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString vconj = dirs->findResource("data", "kiten/vconj");
if (vconj.isNull())
{
diff --git a/kiten/dict.cpp b/kiten/dict.cpp
index 1e605ac3..22aace41 100644
--- a/kiten/dict.cpp
+++ b/kiten/dict.cpp
@@ -69,7 +69,7 @@ File::File(TQString path, TQString n)
: myName(n)
, dictFile(path)
, dictPtr((const unsigned char *)MAP_FAILED)
- , indexFile(KGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(path).baseName() + ".xjdx")
+ , indexFile(TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(path).baseName() + ".xjdx")
, indexPtr((const uint32_t *)MAP_FAILED)
, valid(false)
{
@@ -104,10 +104,10 @@ File::File(TQString path, TQString n)
{
//kdDebug() << "creating " << indexFile.name() << endl;
// find the index generator executable
- KProcess proc;
+ TDEProcess proc;
proc << KStandardDirs::findExe("kitengen") << path << indexFile.name();
// TODO: put up a status dialog and event loop instead of blocking
- proc.start(KProcess::Block, KProcess::NoCommunication);
+ proc.start(TDEProcess::Block, TDEProcess::NoCommunication);
}
if (!dictFile.open(IO_ReadOnly))
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 406554a8..bfff027d 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -54,10 +54,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam
config = Config::self();
config->readConfig();
- Accel = new KGlobalAccel(TQT_TQOBJECT(this));
+ Accel = new TDEGlobalAccel(TQT_TQOBJECT(this));
(void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiSearchAccel()));
(void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, TQT_TQOBJECT(this), TQT_SLOT(searchAccel()));
- Accel->readSettings(KGlobal::config());
+ Accel->readSettings(TDEGlobal::config());
Accel->updateConnections();
_ResultView = new ResultView(true, this, "_ResultView");
@@ -112,7 +112,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam
createLearn();
resize(600, 400);
- applyMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+ applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &)));
connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(autoSearch()));
@@ -163,7 +163,7 @@ bool TopLevel::queryClose()
config->setDeinf(deinfCB->isChecked());
config->writeConfig();
- saveMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
return true;
}
@@ -728,7 +728,7 @@ void TopLevel::toggleCom()
void TopLevel::configureToolBars()
{
- saveMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+ saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
KEditToolbar dlg(actionCollection(), "kitenui.rc");
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
dlg.exec();
@@ -737,7 +737,7 @@ void TopLevel::configureToolBars()
void TopLevel::newToolBarConfig()
{
createGUI("kitenui.rc");
- applyMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+ applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
}
RadWidget *TopLevel::radicalSearch()
diff --git a/kiten/kiten.h b/kiten/kiten.h
index 158c57c7..f82542fb 100644
--- a/kiten/kiten.h
+++ b/kiten/kiten.h
@@ -31,7 +31,7 @@
class Config;
class ConfigureDialog;
class EditAction;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KStatusBar;
class KToggleAction;
class KListAction;
@@ -110,7 +110,7 @@ private:
KAction *backAction;
KAction *forwardAction;
- KGlobalAccel *Accel;
+ TDEGlobalAccel *Accel;
void doSearch(const TQString &text, TQRegExp regexp);
void doSearchInResults(const TQString &text, TQRegExp regexp);
diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp
index d58ff2e0..46167376 100644
--- a/kiten/kromajiedit.cpp
+++ b/kiten/kromajiedit.cpp
@@ -33,7 +33,7 @@ KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name)
{
kana = "unset";
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString romkana = dirs->findResource("data", "kiten/romkana.cnv");
if (romkana.isNull())
{
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index ab03e0c7..20fbeae3 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -51,7 +51,7 @@ void Rad::load()
if (loaded)
return;
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
TQString radkfile = dirs->findResource("data", "kiten/radkfile");
if (radkfile.isNull())
{
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 9f65a4a4..9dbb22d5 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -403,10 +403,10 @@ void eEdit::save()
f.flush();
// find the index generator executable
- KProcess proc;
- proc << KStandardDirs::findExe("kitengen") << filename << KGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx";
+ TDEProcess proc;
+ proc << KStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx";
// TODO: put up a status dialog and event loop instead of blocking
- proc.start(KProcess::Block, KProcess::NoCommunication);
+ proc.start(TDEProcess::Block, TDEProcess::NoCommunication);
statusBar()->message(i18n("Saved"));
isMod = false;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 09:24:58 +0000