summaryrefslogtreecommitdiffstats
path: root/kdict
diff options
context:
space:
mode:
Diffstat (limited to 'kdict')
-rw-r--r--kdict/actions.cpp38
-rw-r--r--kdict/actions.h8
-rw-r--r--kdict/matchview.cpp2
-rw-r--r--kdict/matchview.h4
-rw-r--r--kdict/options.cpp4
-rw-r--r--kdict/queryview.cpp6
-rw-r--r--kdict/queryview.h8
-rw-r--r--kdict/toplevel.cpp34
-rw-r--r--kdict/toplevel.h14
9 files changed, 59 insertions, 59 deletions
diff --git a/kdict/actions.cpp b/kdict/actions.cpp
index 5acf3c3c..9587d9cc 100644
--- a/kdict/actions.cpp
+++ b/kdict/actions.cpp
@@ -9,7 +9,7 @@
-------------------------------------------------------------
- DictComboAction, special KAction subclasses used
+ DictComboAction, special TDEAction subclasses used
DictLabelAction, in the toolbar
DictButtonAction
@@ -26,7 +26,7 @@
DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,
bool editable, bool autoSized )
- : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
+ : TDEAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
{
}
@@ -38,10 +38,10 @@ DictComboAction::~DictComboAction()
int DictComboAction::plug( TQWidget *widget, int index )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar* bar = static_cast<KToolBar*>( widget );
- int id_ = KAction::getToolButtonID();
+ TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
+ int id_ = TDEAction::getToolButtonID();
m_combo = new KComboBox(m_editable,bar);
m_combo->setCompletionMode(m_compMode);
@@ -68,9 +68,9 @@ int DictComboAction::plug( TQWidget *widget, int index )
void DictComboAction::unplug( TQWidget *widget )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar *bar = (KToolBar *)widget;
+ TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar );
@@ -194,7 +194,7 @@ void DictComboAction::slotComboActivated(const TQString &s)
DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name )
- : KAction( text, 0, parent, name )
+ : TDEAction( text, 0, parent, name )
{
}
@@ -206,11 +206,11 @@ DictLabelAction::~DictLabelAction()
int DictLabelAction::plug( TQWidget *widget, int index )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar *tb = (KToolBar *)widget;
+ TDEToolBar *tb = (TDEToolBar *)widget;
- int id = KAction::getToolButtonID();
+ int id = TDEAction::getToolButtonID();
TQLabel *label = new TQLabel( text(), widget, "kde toolbar widget" );
label->setMinimumWidth(label->sizeHint().width());
@@ -235,9 +235,9 @@ int DictLabelAction::plug( TQWidget *widget, int index )
void DictLabelAction::unplug( TQWidget *widget )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar *bar = (KToolBar *)widget;
+ TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar );
@@ -264,7 +264,7 @@ void DictLabelAction::setBuddy(TQWidget *buddy)
DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver,
const char* slot, TQObject* parent, const char* name )
- : KAction( text, 0, receiver, slot, parent, name )
+ : TDEAction( text, 0, receiver, slot, parent, name )
{
}
@@ -276,11 +276,11 @@ DictButtonAction::~DictButtonAction()
int DictButtonAction::plug( TQWidget *widget, int index )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar *tb = (KToolBar *)widget;
+ TDEToolBar *tb = (TDEToolBar *)widget;
- int id = KAction::getToolButtonID();
+ int id = TDEAction::getToolButtonID();
TQPushButton *button = new TQPushButton( text(), widget );
button->adjustSize();
@@ -302,9 +302,9 @@ int DictButtonAction::plug( TQWidget *widget, int index )
void DictButtonAction::unplug( TQWidget *widget )
{
- if ( widget->inherits( "KToolBar" ) )
+ if ( widget->inherits( "TDEToolBar" ) )
{
- KToolBar *bar = (KToolBar *)widget;
+ TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar );
diff --git a/kdict/actions.h b/kdict/actions.h
index bf7553d2..6963acdd 100644
--- a/kdict/actions.h
+++ b/kdict/actions.h
@@ -9,7 +9,7 @@
-------------------------------------------------------------
- DictComboAction, special KAction subclasses used
+ DictComboAction, special TDEAction subclasses used
DictLabelAction, in the toolbar
DictButtonAction
@@ -28,7 +28,7 @@ class TQLabel;
class TQPushButton;
-class DictComboAction : public KAction
+class DictComboAction : public TDEAction
{
Q_OBJECT
@@ -71,7 +71,7 @@ class DictComboAction : public KAction
};
-class DictLabelAction : public KAction
+class DictLabelAction : public TDEAction
{
Q_OBJECT
@@ -91,7 +91,7 @@ class DictLabelAction : public KAction
};
-class DictButtonAction : public KAction
+class DictButtonAction : public TDEAction
{
Q_OBJECT
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 61a8bc70..1502c8fe 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -157,7 +157,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll()));
boxLayout->addWidget(w_getAll,0);
connect(interface,TQT_SIGNAL(matchReady(const TQStringList &)),this,TQT_SLOT(newList(const TQStringList &)));
- rightBtnMenu = new KPopupMenu();
+ rightBtnMenu = new TDEPopupMenu();
}
diff --git a/kdict/matchview.h b/kdict/matchview.h
index 980e8c43..5b193e5d 100644
--- a/kdict/matchview.h
+++ b/kdict/matchview.h
@@ -18,7 +18,7 @@
#define _MATCHVIEW_H_
#include <tqlistview.h>
-class KPopupMenu;
+class TDEPopupMenu;
//********* MatchViewItem ********************************************
@@ -98,7 +98,7 @@ private:
bool getOn, getAllOn;
- KPopupMenu *rightBtnMenu;
+ TDEPopupMenu *rightBtnMenu;
MatchViewItem *popupCurrent;
TQString popupClip; // needed for rightbtn-popup menu
};
diff --git a/kdict/options.cpp b/kdict/options.cpp
index aeff39a9..05b9e0fd 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -901,9 +901,9 @@ void OptionsDialog::slotFontItemSelected(TQListBoxItem *it)
if (it) {
FontListItem *fontItem = static_cast<FontListItem*>(it);
TQFont font = fontItem->font();
- int result = KFontDialog::getFont(font,false,this);
+ int result = TDEFontDialog::getFont(font,false,this);
- if (result == KFontDialog::Accepted) {
+ if (result == TDEFontDialog::Accepted) {
fontItem->setFont(font);
f_List->triggerUpdate(false);
slotChanged();
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 7dbeaba4..0aa6f1b8 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -143,7 +143,7 @@ QueryView::QueryView(TQWidget *_parent)
setFocusPolicy(TQ_NoFocus);
connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted()));
connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked()));
- rightBtnMenu = new KPopupMenu(this);
+ rightBtnMenu = new TDEPopupMenu(this);
connect(part,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQT_SLOT(buildPopupMenu(const TQString &, const TQPoint &)));
connect(part->browserExtension(),TQT_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)),
this,TQT_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &)));
@@ -157,7 +157,7 @@ QueryView::~QueryView()
{}
-void QueryView::setActions(KToolBarPopupAction* NactBack, KToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo)
+void QueryView::setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo)
{
actBack = NactBack;
connect(actBack->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseBack(int)));
@@ -282,7 +282,7 @@ void QueryView::copySelection()
void QueryView::showFindDialog()
{
- KAction *act = part->actionCollection()->action("find");
+ TDEAction *act = part->actionCollection()->action("find");
if (act)
act->activate();
}
diff --git a/kdict/queryview.h b/kdict/queryview.h
index 359eac85..475e480a 100644
--- a/kdict/queryview.h
+++ b/kdict/queryview.h
@@ -24,7 +24,7 @@
class TQFile;
class KTempFile;
-class KPopupMenu;
+class TDEPopupMenu;
class DictComboAction;
@@ -106,7 +106,7 @@ public:
QueryView(TQWidget *_parent = 0L);
~QueryView();
- void setActions(KToolBarPopupAction* NactBack, KToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo);
+ void setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo);
bool browseBackPossible() const;
bool browseForwardPossible() const;
@@ -164,10 +164,10 @@ private:
DictHTMLPart *part; // Widgets
- KToolBarPopupAction *actBack, *actForward;
+ TDEToolBarPopupAction *actBack, *actForward;
DictComboAction *actQueryCombo;
- KPopupMenu *rightBtnMenu;
+ TDEPopupMenu *rightBtnMenu;
TQString popupLink,popupSelect; // needed for rightbtn-popup menu
TQPtrList<BrowseData> browseList;
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index a1bacd2b..6c67fd7c 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -51,7 +51,7 @@ GlobalData *global;
TopLevel::TopLevel(TQWidget* parent, const char* name)
- : DCOPObject("KDictIface"), KMainWindow(parent, name, WType_TopLevel),
+ : DCOPObject("KDictIface"), TDEMainWindow(parent, name, WType_TopLevel),
optDlg(0L), setsDlg(0L), stopRef(0)
{
kapp->dcopClient()->setDefaultObject(objId());
@@ -313,9 +313,9 @@ void TopLevel::setupActions()
actSave->setEnabled(false);
actPrint = KStdAction::print(TQT_TQOBJECT(queryView), TQT_SLOT(printQuery()), actionCollection());
actPrint->setEnabled(false);
- actStartQuery = new KAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
+ actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
TQT_SLOT(doDefine()), actionCollection(), "start_query");
- actStopQuery = new KAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this),
+ actStopQuery = new TDEAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this),
TQT_SLOT(stopClients()), actionCollection(), "stop_query");
actStopQuery->setEnabled(false);
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
@@ -324,43 +324,43 @@ void TopLevel::setupActions()
actCopy = KStdAction::copy(TQT_TQOBJECT(queryView), TQT_SLOT(copySelection()), actionCollection());
actCopy->setEnabled(false);
KStdAction::selectAll(TQT_TQOBJECT(queryView), TQT_SLOT(selectAll()), actionCollection());
- new KAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this),
TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
- new KAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
KStdAction::find(TQT_TQOBJECT(queryView), TQT_SLOT(showFindDialog()), actionCollection());
// history menu...
- actBack = new KToolBarPopupAction(i18n("&Back"), "back", KStdAccel::shortcut(KStdAccel::Back),
+ actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back),
TQT_TQOBJECT(queryView), TQT_SLOT(browseBack()), actionCollection(),"browse_back");
actBack->setDelayed(true);
actBack->setStickyMenu(false);
actBack->setEnabled(false);
- actForward = new KToolBarPopupAction(i18n("&Forward"), "forward", KStdAccel::shortcut(KStdAccel::Forward),
+ actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward),
TQT_TQOBJECT(queryView), TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
actForward->setDelayed(true);
actForward->setStickyMenu(false);
actForward->setEnabled(false);
- new KAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
// server menu...
- new KAction(i18n("&Get Capabilities"), 0 , interface,
+ new TDEAction(i18n("&Get Capabilities"), 0 , interface,
TQT_SLOT(updateServer()), actionCollection(), "get_capabilities");
- new KAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this),
TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
- new KAction(i18n("&Summary"), 0 , interface,
+ new TDEAction(i18n("&Summary"), 0 , interface,
TQT_SLOT(showDatabases()), actionCollection(), "db_summary");
- new KAction(i18n("S&trategy Information"), 0 , interface,
+ new TDEAction(i18n("S&trategy Information"), 0 , interface,
TQT_SLOT(showStrategies()), actionCollection(), "strategy_info");
- new KAction(i18n("&Server Information"), 0 , interface,
+ new TDEAction(i18n("&Server Information"), 0 , interface,
TQT_SLOT(showInfo()), actionCollection(), "server_info");
// settings menu...
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- actShowMatchList = new KToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this),
+ actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
actShowMatchList->setCheckedState(i18n("Hide &Match List"));
actShowMatchList->setChecked(global->showMatchList);
@@ -370,7 +370,7 @@ actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptionsDialog()), actionCollection());
// toolbar...
- new KAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this),
TQT_SLOT(clearInput()), actionCollection(), "clear_query");
actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label");
@@ -503,7 +503,7 @@ void TopLevel::buildHistMenu()
unsigned int i = 0;
while ((i<10)&&(i<global->queryHistory.count())) {
- historyActionList.append( new KAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()),
+ historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()),
(TQObject*)0, global->queryHistory[i].utf8().data()) );
i++;
}
@@ -542,7 +542,7 @@ void TopLevel::stratDbChanged()
dbActionList.clear();
for (unsigned int i=0;i<global->serverDatabases.count();i++)
- dbActionList.append( new KAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()),
+ dbActionList.append( new TDEAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()),
(TQObject*)0, global->serverDatabases[i].utf8().data()) );
plugActionList("db_detail", dbActionList);
diff --git a/kdict/toplevel.h b/kdict/toplevel.h
index d9653413..f6ecb6a9 100644
--- a/kdict/toplevel.h
+++ b/kdict/toplevel.h
@@ -23,8 +23,8 @@
class TQSplitter;
-class KToggleAction;
-class KToolBarPopupAction;
+class TDEToggleAction;
+class TDEToolBarPopupAction;
class DictLabelAction;
class DictComboAction;
@@ -35,7 +35,7 @@ class OptionsDialog;
class DbSetsDialog;
-class TopLevel : public KMainWindow, virtual public KDictIface
+class TopLevel : public TDEMainWindow, virtual public KDictIface
{
Q_OBJECT
@@ -129,13 +129,13 @@ private slots:
private:
- KAction *actSave, *actPrint, *actStartQuery, *actStopQuery, *actCopy;
- KToggleAction *actShowMatchList;
+ TDEAction *actSave, *actPrint, *actStartQuery, *actStopQuery, *actCopy;
+ TDEToggleAction *actShowMatchList;
DictLabelAction *actQueryLabel, *actDbLabel;
DictComboAction *actQueryCombo, *actDbCombo;
DictButtonAction *actDefineBtn, *actMatchBtn;
- TQPtrList<KAction> historyActionList, dbActionList;
- KToolBarPopupAction *actBack, *actForward;
+ TQPtrList<TDEAction> historyActionList, dbActionList;
+ TDEToolBarPopupAction *actBack, *actForward;
TQSplitter *splitter; // widgets....
QueryView *queryView;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 06:59:38 +0000