summaryrefslogtreecommitdiffstats
path: root/kiten
diff options
context:
space:
mode:
Diffstat (limited to 'kiten')
-rw-r--r--kiten/configdictionaries.cpp8
-rw-r--r--kiten/configdictionaries.h4
-rw-r--r--kiten/configdictionariesbase.ui4
-rw-r--r--kiten/configfont.ui2
-rw-r--r--kiten/kiten.cpp36
-rw-r--r--kiten/kiten.h24
-rw-r--r--kiten/learn.cpp20
-rw-r--r--kiten/learn.h32
-rw-r--r--kiten/optiondialog.h4
-rw-r--r--kiten/rad.cpp4
-rw-r--r--kiten/rad.h6
-rw-r--r--kiten/widgets.cpp24
-rw-r--r--kiten/widgets.h14
13 files changed, 91 insertions, 91 deletions
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index 1df5a36b..e6ec117d 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -76,7 +76,7 @@ void ConfigDictionaries::writeDictionaries()
void ConfigDictionaries::readDictionaryList(const TQString& group)
{
- KListView* list;
+ TDEListView* list;
TQStringList names;
if (group == "edict")
{
@@ -104,7 +104,7 @@ void ConfigDictionaries::readDictionaryList(const TQString& group)
void ConfigDictionaries::writeDictionaryList(const TQString& group)
{
- KListView* list;
+ TDEListView* list;
if (group == "edict")
list = edictList;
else //if (group == "kanjidic")
@@ -138,7 +138,7 @@ void ConfigDictionaries::slotDelSelEdict() { delSel(edictList); }
void ConfigDictionaries::slotAddKanjidic() { add(kanjidicList); }
void ConfigDictionaries::slotDelSelKanjidic() { delSel(kanjidicList); }
-void ConfigDictionaries::add(KListView* list)
+void ConfigDictionaries::add(TDEListView* list)
{
TQListViewItem *item = list->firstChild();
TQString filename = KFileDialog::getOpenFileName(item? TQFileInfo(item->text(1)).dirPath(true).append("/") : TQString());
@@ -149,7 +149,7 @@ void ConfigDictionaries::add(KListView* list)
emit widgetChanged();
}
-void ConfigDictionaries::delSel(KListView* list)
+void ConfigDictionaries::delSel(TDEListView* list)
{
TQListViewItem *file = list->selectedItem();
if (!file)
diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h
index 22933ed3..7f8e1051 100644
--- a/kiten/configdictionaries.h
+++ b/kiten/configdictionaries.h
@@ -54,8 +54,8 @@ private:
Config* config;
void readDictionaryList(const TQString& group);
void writeDictionaryList(const TQString& group);
- void add(KListView* list);
- void delSel(KListView* list);
+ void add(TDEListView* list);
+ void delSel(TDEListView* list);
};
#endif
diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 3ad28605..77bb52ad 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -88,7 +88,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
@@ -226,7 +226,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
diff --git a/kiten/configfont.ui b/kiten/configfont.ui
index d198336a..90b5ac72 100644
--- a/kiten/configfont.ui
+++ b/kiten/configfont.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser">
+ <widget class="TDEFontChooser">
<property name="name">
<cstring>kcfg_font</cstring>
</property>
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 0a10ba0c..c5609c21 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -46,7 +46,7 @@
#include <cassert>
-TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, name)
+TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, name)
{
#if TDE_VERSION > 305
setStandardToolBarMenuEnabled(true);
@@ -67,27 +67,27 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, nam
(void) KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
(void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- (void) new KAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn");
- (void) new KAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
- (void) new KAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
+ (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn");
+ (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor");
+ (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical");
Edit = new EditAction(i18n("Search Edit"), 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search_edit");
- (void) new KAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
- (void) new KAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search");
- (void) new KAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
- (void) new KAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
- (void) new KAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
- (void) new KAction(i18n("&Grade"), "leftjust", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
- kanjiCB = new KToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
- deinfCB = new KToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
- comCB = new KToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
- autoSearchToggle = new KToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
- irAction = new KAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
+ (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search");
+ (void) new TDEAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search");
+ (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning");
+ (void) new TDEAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere");
+ (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke");
+ (void) new TDEAction(i18n("&Grade"), "leftjust", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade");
+ kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle");
+ deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle");
+ comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common");
+ autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle");
+ irAction = new TDEAction(i18n("Search &in Results"), "find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results");
(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
- addAction = new KAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
+ addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add");
addAction->setEnabled(false);
- (void) new KAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
+ (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding");
- historyAction = new KListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
+ historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history");
connect(historyAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(goInHistory(int)));
backAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
diff --git a/kiten/kiten.h b/kiten/kiten.h
index f82542fb..ef5cfda4 100644
--- a/kiten/kiten.h
+++ b/kiten/kiten.h
@@ -33,12 +33,12 @@ class ConfigureDialog;
class EditAction;
class TDEGlobalAccel;
class KStatusBar;
-class KToggleAction;
-class KListAction;
+class TDEToggleAction;
+class TDEListAction;
class Learn;
class ResultView;
-class KDE_EXPORT TopLevel : public KMainWindow
+class KDE_EXPORT TopLevel : public TDEMainWindow
{
Q_OBJECT
@@ -100,15 +100,15 @@ private:
Rad _Rad;
Deinf::Index _DeinfIndex;
ResultView *_ResultView;
- KToggleAction *kanjiCB;
- KToggleAction *autoSearchToggle;
- KToggleAction *deinfCB;
- KListAction *historyAction;
- KAction *irAction;
- KAction *addAction;
- KToggleAction *comCB;
- KAction *backAction;
- KAction *forwardAction;
+ TDEToggleAction *kanjiCB;
+ TDEToggleAction *autoSearchToggle;
+ TDEToggleAction *deinfCB;
+ TDEListAction *historyAction;
+ TDEAction *irAction;
+ TDEAction *addAction;
+ TDEToggleAction *comCB;
+ TDEAction *backAction;
+ TDEAction *forwardAction;
TDEGlobalAccel *Accel;
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index 6ffbaeea..cc85487e 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -61,7 +61,7 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const
const int Learn::numberOfAnswers = 5;
Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
- : KMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
+ : TDEMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
{
index = parentDict;
@@ -83,7 +83,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
View->setBasicMode(true);
connect(View, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SIGNAL(linkClicked(const TQString &)));
- List = new KListView(listTop);
+ List = new TDEListView(listTop);
List->addColumn(i18n("Kanji"));
List->addColumn(i18n("Meanings"));
@@ -99,7 +99,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
List->setMultiSelection(true);
List->setDragEnabled(true);
List->setSorting(4);
- List->setSelectionModeExt(KListView::Extended);
+ List->setSelectionModeExt(TDEListView::Extended);
connect(List, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(showKanji(TQListViewItem *)));
connect(List, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(itemSelectionChanged()));
@@ -113,20 +113,20 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
grades.append(i18n("Others in Jouyou"));
grades.append(i18n("Jinmeiyou"));
- /*KAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ /*TDEAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
printAct = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
forwardAct = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(next()), actionCollection());
forwardAct->plug(toolBar());
backAct = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(prev()), actionCollection());
backAct->plug(toolBar());
- cheatAct = new KAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat");
- randomAct = new KAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random");
- gradeAct = new KListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
+ cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat");
+ randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random");
+ gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade");
gradeAct->setItems(grades);
connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade()));
- removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
- addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
- addAllAct = new KAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall");
+ removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
+ addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
+ addAllAct = new TDEAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall");
newAct = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
openAct = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
diff --git a/kiten/learn.h b/kiten/learn.h
index d6fe41ef..2312cf46 100644
--- a/kiten/learn.h
+++ b/kiten/learn.h
@@ -28,7 +28,7 @@
#include "widgets.h"
-class KAction;
+class TDEAction;
class KPushButton;
class TQButtonGroup;
class TQListViewItem;
@@ -43,7 +43,7 @@ public:
int compare(TQListViewItem *item, int col, bool ascending) const;
};
-class Learn : public KMainWindow
+class Learn : public TDEMainWindow
{
Q_OBJECT
@@ -118,7 +118,7 @@ class Learn : public KMainWindow
Dict::Index *index;
- KListView *List;
+ TDEListView *List;
KPushButton *Save;
KPushButton *Del;
KPushButton *qDel;
@@ -146,19 +146,19 @@ class Learn : public KMainWindow
// to the list.
TQString randomMeaning(TQStringList &oldMeanings);
- KAction *forwardAct;
- KAction *printAct;
- KAction *backAct;
- KAction *cheatAct;
- KAction *saveAct;
- KAction *openAct;
- KAction *newAct;
- KAction *saveAsAct;
- KAction *addAct;
- KAction *addAllAct;
- KAction *removeAct;
- KAction *randomAct;
- KListAction *gradeAct;
+ TDEAction *forwardAct;
+ TDEAction *printAct;
+ TDEAction *backAct;
+ TDEAction *cheatAct;
+ TDEAction *saveAct;
+ TDEAction *openAct;
+ TDEAction *newAct;
+ TDEAction *saveAsAct;
+ TDEAction *addAct;
+ TDEAction *addAllAct;
+ TDEAction *removeAct;
+ TDEAction *randomAct;
+ TDEListAction *gradeAct;
int getCurrentGrade(void);
void setCurrentGrade(int grade);
diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h
index 61e5a4c7..d9319a4d 100644
--- a/kiten/optiondialog.h
+++ b/kiten/optiondialog.h
@@ -22,9 +22,9 @@
#ifndef OPTIONDIALOG_H
#define OPTIONDIALOG_H
-class KListView;
+class TDEListView;
class TQString;
-class KFontChooser;
+class TDEFontChooser;
class TQLabel;
class TQPushButton;
class TQComboBox;
diff --git a/kiten/rad.cpp b/kiten/rad.cpp
index 54fa4025..602cdf6a 100644
--- a/kiten/rad.cpp
+++ b/kiten/rad.cpp
@@ -276,13 +276,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p
TQToolTip::add(strokesSpin, i18n("Show radicals having this number of strokes"));
middlevLayout->addWidget(strokesSpin);
- List = new KListBox(this);
+ List = new TDEListBox(this);
middlevLayout->addWidget(List);
connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *)));
connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int)));
TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
- selectedList = new KListBox(this);
+ selectedList = new TDEListBox(this);
rightvlayout->addWidget(selectedList);
connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
diff --git a/kiten/rad.h b/kiten/rad.h
index 6fe1ea23..54c5cc99 100644
--- a/kiten/rad.h
+++ b/kiten/rad.h
@@ -30,7 +30,7 @@ class TQLabel;
class TQListBoxItem;
class TQSpinBox;
class KPushButton;
-class KListBox;
+class TDEListBox;
class TQButtonGroup;
class KDE_EXPORT Radical
@@ -110,8 +110,8 @@ class KDE_EXPORT RadWidget : public TQWidget
KPushButton *clear;
TQButtonGroup *hotlistGroup;
TQCheckBox *totalStrokes;
- KListBox *List;
- KListBox *selectedList;
+ TDEListBox *List;
+ TDEListBox *selectedList;
TQStringList selected;
Rad *rad;
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index f7fec883..9a278ecb 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -293,10 +293,10 @@ void ResultView::updateFont()
// nice EDICT dictionary editor
eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
- : KMainWindow(parent, name)
+ : TDEMainWindow(parent, name)
, filename(_filename)
{
- List = new KListView(this);
+ List = new TDEListView(this);
setCentralWidget(List);
List->addColumn(i18n("Kanji"));
@@ -318,9 +318,9 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
List->setDragEnabled(true);
saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- removeAct = new KAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
- (void) new KAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable");
- addAct = new KAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
+ removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del");
+ (void) new TDEAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable");
+ addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add");
(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
createGUI("eeditui.rc");
@@ -338,7 +338,7 @@ eEdit::~eEdit()
void eEdit::add()
{
if (List)
- new KListViewItem(List);
+ new TDEListViewItem(List);
}
void eEdit::openFile(const TQString &file)
@@ -437,7 +437,7 @@ void eEdit::del()
// sorta taken from konqy
EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name)
- : KAction(text, accel, parent, name)
+ : TDEAction(text, accel, parent, name)
{
m_receiver = receiver;
m_member = member;
@@ -449,12 +449,12 @@ EditAction::~EditAction()
int EditAction::plug( TQWidget *w, int index )
{
- // if ( !w->inherits( "KToolBar" ) )
+ // if ( !w->inherits( "TDEToolBar" ) )
// return -1;
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
- int id = KAction::getToolButtonID();
+ int id = TDEAction::getToolButtonID();
KRomajiEdit *comboBox = new KRomajiEdit(toolBar, "search edit");
toolBar->insertWidget( id, 70, comboBox, index );
@@ -477,10 +477,10 @@ int EditAction::plug( TQWidget *w, int index )
void EditAction::unplug( TQWidget *w )
{
-// if ( !w->inherits( "KToolBar" ) )
+// if ( !w->inherits( "TDEToolBar" ) )
// return;
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
int idx = findContainer( w );
diff --git a/kiten/widgets.h b/kiten/widgets.h
index 7ca5ac60..1bf0782a 100644
--- a/kiten/widgets.h
+++ b/kiten/widgets.h
@@ -28,7 +28,7 @@
#include <kmainwindow.h>
#include <ktextbrowser.h>
-class KListView;
+class TDEListView;
class KStatusBar;
#include "dict.h"
@@ -64,7 +64,7 @@ class KDE_EXPORT ResultView : public KTextBrowser
bool basicMode;
};
-class KDE_EXPORT eEdit : public KMainWindow
+class KDE_EXPORT eEdit : public TDEMainWindow
{
Q_OBJECT
@@ -81,16 +81,16 @@ class KDE_EXPORT eEdit : public KMainWindow
void openFile(const TQString &);
private:
- KListView *List;
+ TDEListView *List;
TQString filename;
KStatusBar *StatusBar;
- KAction *addAct;
- KAction *removeAct;
- KAction *saveAct;
+ TDEAction *addAct;
+ TDEAction *removeAct;
+ TDEAction *saveAct;
bool isMod;
};
-class KDE_EXPORT EditAction : public KAction
+class KDE_EXPORT EditAction : public TDEAction
{
Q_OBJECT