summaryrefslogtreecommitdiffstats
path: root/lib/kopalette
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kopalette')
-rw-r--r--lib/kopalette/kopalette.cc2
-rw-r--r--lib/kopalette/kopalettemanager.cc28
-rw-r--r--lib/kopalette/kopalettemanager.h18
3 files changed, 24 insertions, 24 deletions
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index c84d6b5e..e93cae7c 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -44,7 +44,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
{
#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90)
- KAcceleratorManager::setNoAccel(this);
+ TDEAcceleratorManager::setNoAccel(this);
#endif
setCloseMode( TQDockWindow::Never);
setResizeEnabled(true);
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 2a9d1f5c..de35054a 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -42,7 +42,7 @@
#include <kopalettemanager.h>
-KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const char * name)
+KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const char * name)
: TQObject(view, name)
{
@@ -50,7 +50,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
m_view->installEventFilter(this);
m_actionCollection = ac;
- m_actions = new TQDict<KToggleAction>();
+ m_actions = new TQDict<TDEToggleAction>();
m_widgets = new TQDict<TQWidget>();
m_palettes = new TQDict<KoPalette>();
m_palettes->setAutoDelete(true);
@@ -63,16 +63,16 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
m_mapper = new TQSignalMapper(this);
connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int)));
- m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu");
+ m_viewActionMenu = new TDEActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu");
TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup("palettes");
bool palettesShown = cfg->readBoolEntry("palettesshown", true);
- KToggleAction * m_toggleShowHidePalettes;
+ TDEToggleAction * m_toggleShowHidePalettes;
if ( palettesShown) {
- m_toggleShowHidePalettes = new KToggleAction(i18n("Hide All Palette Windows"),
+ m_toggleShowHidePalettes = new TDEToggleAction(i18n("Hide All Palette Windows"),
"CTRL+SHIFT+H", this,
TQT_SLOT(slotToggleAllPalettes()),
m_actionCollection, "toggleAllPaletteWindows");
@@ -80,7 +80,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
m_toggleShowHidePalettes->setCheckedState(i18n("Show Palette Windows Again"));
}
else {
- m_toggleShowHidePalettes = new KToggleAction(i18n("Show Palette Windows Again"),
+ m_toggleShowHidePalettes = new TDEToggleAction(i18n("Show Palette Windows Again"),
"CTRL+SHIFT+H", this,
TQT_SLOT(slotToggleAllPalettes()),
m_actionCollection, "toggleAllPaletteWindows");
@@ -105,7 +105,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
}
/*
- KAction * a = new KAction(i18n("Restore Palettes"),
+ TDEAction * a = new TDEAction(i18n("Restore Palettes"),
0, this,
TQT_SLOT(slotReset()),
this, "restorePalettes");
@@ -164,8 +164,8 @@ void KoPaletteManager::addWidget(TQWidget * widget,
m_defaultPaletteOrder.append(pname+ "," + TQString::number(style));
}
- KToggleAction * a;
- a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
+ TDEToggleAction * a;
+ a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection);
a->setCheckedState(i18n("Hide %1").arg(widget->caption()));
m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action
@@ -285,7 +285,7 @@ void KoPaletteManager::showWidget(const TQString & name)
KoPalette * p = m_palettes->find(pname);
p->showPage(w);
- KToggleAction * a = m_actions->find(name);
+ TDEToggleAction * a = m_actions->find(name);
a->setChecked(true);
}
@@ -300,7 +300,7 @@ void KoPaletteManager::hideWidget(const TQString & name)
KoPalette * p = m_palettes->find(pname);
p->hidePage(w);
- KToggleAction * a = m_actions->find(name);
+ TDEToggleAction * a = m_actions->find(name);
a->setChecked(false);
}
@@ -320,7 +320,7 @@ void KoPaletteManager::removeWidget(const TQString & name)
m_widgets->remove(name);
m_currentMapping->remove(name);
- KAction * a = m_actions->take(name);
+ TDEAction * a = m_actions->take(name);
m_viewActionMenu->remove(a);
m_actionCollection->remove(a);
}
@@ -458,7 +458,7 @@ void KoPaletteManager::slotToggleAllPalettes()
{
TQString name = m_hiddenWidgets.pop();
TQWidget *w = m_widgets->find(name);
- KToggleAction * a = m_actions->find(name);
+ TDEToggleAction * a = m_actions->find(name);
a->setChecked(true);
TQString pname = *m_currentMapping->find(name);
@@ -473,7 +473,7 @@ void KoPaletteManager::slotToggleAllPalettes()
TQDictIterator<TQWidget> it(*m_widgets);
for (; it.current(); ++it)
{
- KToggleAction * a = m_actions->find(it.currentKey());
+ TDEToggleAction * a = m_actions->find(it.currentKey());
if(a->isChecked())
{
a->setChecked(false);
diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h
index 333a3cb6..090f237d 100644
--- a/lib/kopalette/kopalettemanager.h
+++ b/lib/kopalette/kopalettemanager.h
@@ -33,10 +33,10 @@
#include <KoView.h>
class KoPalette;
-class KActionMenu;
-class KAction;
-class KActionCollection;
-class KToggleAction;
+class TDEActionMenu;
+class TDEAction;
+class TDEActionCollection;
+class TDEToggleAction;
enum enumKoDockability {
DOCK_ENABLED = 0, // It's possible to dock the dockers
@@ -90,7 +90,7 @@ class KOPALETTE_EXPORT KoPaletteManager : public TQObject {
public:
- KoPaletteManager(KoView * view, KActionCollection * ac, const char * name);
+ KoPaletteManager(KoView * view, TDEActionCollection * ac, const char * name);
virtual ~KoPaletteManager();
public:
@@ -199,9 +199,9 @@ private:
private:
KoView * m_view;
- KActionCollection * m_actionCollection;
- KActionMenu * m_viewActionMenu;
- KToggleAction * m_toggleShowHidePalettes;
+ TDEActionCollection * m_actionCollection;
+ TDEActionMenu * m_viewActionMenu;
+ TDEToggleAction * m_toggleShowHidePalettes;
enumKoDockability m_dockability;
TQStringList * m_widgetNames;
@@ -209,7 +209,7 @@ private:
TQDict<TQWidget> * m_widgets;
TQDict<KoPalette> * m_palettes;
TQValueStack<TQString> m_hiddenWidgets; // names of widgets actively hidden by hide all
- TQDict<KToggleAction> * m_actions;
+ TQDict<TDEToggleAction> * m_actions;
TQSignalMapper * m_mapper;
TQMap<TQString, TQString> * m_defaultMapping; // widget to docker