diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
| commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
| tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kiten/kiten.cpp | |
| parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
| download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kiten/kiten.cpp')
| -rw-r--r-- | kiten/kiten.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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() |