summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/qpevents.cpp2
-rw-r--r--quanta/utility/quantabookmarks.cpp14
-rw-r--r--quanta/utility/quantabookmarks.h18
-rw-r--r--quanta/utility/quantacommon.h2
-rw-r--r--quanta/utility/tagaction.cpp18
-rw-r--r--quanta/utility/tagaction.h14
-rw-r--r--quanta/utility/tagactionmanager.cpp2
-rw-r--r--quanta/utility/tagactionmanager.h6
-rw-r--r--quanta/utility/tagactionset.cpp82
-rw-r--r--quanta/utility/tagactionset.h16
-rw-r--r--quanta/utility/toolbartabwidget.cpp18
-rw-r--r--quanta/utility/toolbartabwidget.h18
12 files changed, 105 insertions, 105 deletions
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 3426b83f..beb21170 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -321,7 +321,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
if (ev.action == "script" || ev.action =="action")
{
TQString name = ev.arguments[0];
- KAction *action = quantaApp->actionCollection()->action(name.ascii());
+ TDEAction *action = quantaApp->actionCollection()->action(name.ascii());
TagAction *tagAction = dynamic_cast<TagAction*>(action);
if (tagAction)
{
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 0678a972..09529616 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -76,34 +76,34 @@ QuantaBookmarks::~QuantaBookmarks()
{
}
-void QuantaBookmarks::createActions( KActionCollection* ac )
+void QuantaBookmarks::createActions( TDEActionCollection* ac )
{
- m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
+ m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
init(ac);
}
-void QuantaBookmarks::init(KActionCollection* ac)
+void QuantaBookmarks::init(TDEActionCollection* ac)
{
- m_bookmarkToggle = new KToggleAction(
+ m_bookmarkToggle = new TDEToggleAction(
i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
this, TQT_SLOT(toggleBookmark()),
ac, "bookmarks_toggle" );
m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
- m_bookmarkClear = new KAction(
+ m_bookmarkClear = new TDEAction(
i18n("Clear &All Bookmarks"), 0,
this, TQT_SLOT(clearBookmarks()),
ac, "bookmarks_clear");
m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
- m_goNext = new KAction(
+ m_goNext = new TDEAction(
i18n("Next Bookmark"), "next", ALT + Key_PageDown,
this, TQT_SLOT(goNext()),
ac, "bookmarks_next");
m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
- m_goPrevious = new KAction(
+ m_goPrevious = new TDEAction(
i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
this, TQT_SLOT(goPrevious()),
ac, "bookmarks_previous");
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index 83f30aa6..71353c17 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -32,9 +32,9 @@ namespace KTextEditor { class Mark; }
class ViewManager;
class Document;
-class KAction;
-class KToggleAction;
-class KActionCollection;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionCollection;
class TQPopupMenu;
class TQMenuData;
@@ -50,7 +50,7 @@ class QuantaBookmarks : public TQObject
QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false );
virtual ~QuantaBookmarks();
- void createActions( KActionCollection* );
+ void createActions( TDEActionCollection* );
void setBookmarksMenu(TQPopupMenu* bookmarksMenu);
QuantaBookmarks::Sorting sorting() { return m_sorting; };
@@ -59,7 +59,7 @@ class QuantaBookmarks : public TQObject
protected:
int insertBookmarks(TQPopupMenu& menu, Document *doc, bool insertNavigationItems = true);
- void init(KActionCollection* ac = 0L);
+ void init(TDEActionCollection* ac = 0L);
private slots:
void toggleBookmark();
@@ -78,10 +78,10 @@ class QuantaBookmarks : public TQObject
void gotoFileAndLine(const TQString&, int, int);
private:
- KToggleAction* m_bookmarkToggle;
- KAction* m_bookmarkClear;
- KAction* m_goNext;
- KAction* m_goPrevious;
+ TDEToggleAction* m_bookmarkToggle;
+ TDEAction* m_bookmarkClear;
+ TDEAction* m_goNext;
+ TDEAction* m_goPrevious;
Sorting m_sorting;
TQPopupMenu* m_bookmarksMenu;
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index 4553da9c..b341d6ac 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -36,7 +36,7 @@ class TQWidget;
class Tag;
class TDEConfig;
-class KPopupMenu;
+class TDEPopupMenu;
/** Describes one abbreviation group */
class Abbreviation{
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index d532a8b8..c4c3b870 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -72,9 +72,9 @@ int MyProcess::commSetupDoneC()
return TDEProcess::commSetupDoneC();
}
-TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
- : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()),
- KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
+TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bool toggle)
+ : TDEToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()),
+ TDEShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
//disable toggle now m_toggle(toggle)
m_toggle(false)
{
@@ -93,8 +93,8 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool
m_file = 0L;
loopStarted = false;
#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
- connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
- TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState)));
+ connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
+ TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState)));
#else
connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated()));
#endif
@@ -114,7 +114,7 @@ TQString TagAction::type()
}
#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
-bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState /*state*/)
{
QuantaView *view = ViewManager::ref()->activeView();
if ( !view || !view->document())
@@ -182,7 +182,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
kafkaCommon::getStartOfParagraph(start_node, start_offset);
kafkaCommon::getEndOfParagraph(end_node, end_offset);
}
- else if(reason != KAction::EmulatedActivation) // is between words: save the state and return
+ else if(reason != TDEAction::EmulatedActivation) // is between words: save the state and return
{
if(!toggled())
quantaApp->insertTagActionPoolItem(name());
@@ -488,7 +488,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
#else
// hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains
// of no matching function.
-bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(TDEAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
{return true;}
#endif
@@ -954,7 +954,7 @@ TQString TagAction::closeXMLTagString() const
void TagAction::slotActivated()
{
// if(m_toggle)
- KToggleAction::slotActivated();
+ TDEToggleAction::slotActivated();
//Andras: Disable toggle behavior. It is just too broken.
setChecked(false);
/*
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index 3a58f603..84e01465 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqdom.h>
-class KMainWindow;
+class TDEMainWindow;
class QuantaView;
class TDEProcess;
class TQDomElement;
@@ -44,7 +44,7 @@ class NodeSelection;
* Paulo Moura Guedes, moura@tdewebdev.org
*/
-class TagAction : public KToggleAction
+class TagAction : public TDEToggleAction
{
Q_OBJECT
@@ -52,10 +52,10 @@ class TagAction : public KToggleAction
public:
/**
* Create an insert from dom element.
- * @param toggle If set to true, the class behaves like a KToggleAction;
- * Else it behaves like a KAction. This avoids the multi-inheritance problem.
+ * @param toggle If set to true, the class behaves like a TDEToggleAction;
+ * Else it behaves like a TDEAction. This avoids the multi-inheritance problem.
*/
- TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false);
+ TagAction(TQDomElement *element, TDEMainWindow *parentMainWindow, bool toggle = false);
virtual ~TagAction();
TQDomElement data() const { return tag; }
@@ -94,7 +94,7 @@ public slots:
* We need this information in order to know if queued actions should be applied.
* It's public because it can be activated by other classes if there are any queued actions.
*/
- virtual bool slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState state);
+ virtual bool slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState state);
protected slots:
virtual void slotGetScriptOutput( TDEProcess *, char *buffer, int buflen );
@@ -127,7 +127,7 @@ private:
TQTimer* timer;
TQDomElement tag;
TQFile* m_file;
- KMainWindow *m_parentMainWindow;
+ TDEMainWindow *m_parentMainWindow;
TQString m_inputFileName;
TQStringList m_argsList;
uint m_killCount;
diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp
index eaad16ec..63df0010 100644
--- a/quanta/utility/tagactionmanager.cpp
+++ b/quanta/utility/tagactionmanager.cpp
@@ -58,7 +58,7 @@ void TagActionManager::initActions(TQWidget* parent)
{
Q_ASSERT(parent);
- m_actionCollection = new KActionCollection(parent);
+ m_actionCollection = new TDEActionCollection(parent);
TagActionSet* general(new TagActionSet());
general->initActions(parent);
diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h
index 6a6a45a9..de36356a 100644
--- a/quanta/utility/tagactionmanager.h
+++ b/quanta/utility/tagactionmanager.h
@@ -18,7 +18,7 @@
#ifndef TAGACTIONMANAGER_H
#define TAGACTIONMANAGER_H
-class KActionCollection;
+class TDEActionCollection;
namespace DOM
{
class Node;
@@ -52,7 +52,7 @@ public:
static bool canIndentDTD(TQString const& dtd);
- KActionCollection* actionCollection() const
+ TDEActionCollection* actionCollection() const
{
return m_actionCollection;
}
@@ -67,7 +67,7 @@ private:
private:
static TagActionManager* s_mSelf;
- KActionCollection* m_actionCollection;
+ TDEActionCollection* m_actionCollection;
TQPtrList<TagActionSetAbstract> m_tagActionSets;
};
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index a5397df8..31f246ec 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -84,7 +84,7 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co
TagActionSet::TagActionSet(TQObject *parent, const char *name)
: TagActionSetAbstract(parent, name), m_separator(0)
{
- m_separator = new KActionSeparator();
+ m_separator = new TDEActionSeparator();
}
bool TagActionSet::isInTagContext() const
@@ -98,20 +98,20 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/)
void TagActionSet::initActions(TQWidget* /*parent*/)
{
- KActionCollection* ac(TagActionManager::self()->actionCollection());
+ TDEActionCollection* ac(TagActionManager::self()->actionCollection());
const char *actionName = "apply_source_indentation";
- new KAction(i18n("Apply Source Indentation"), 0, this,
+ new TDEAction(i18n("Apply Source Indentation"), 0, this,
TQT_SLOT(slotApplySourceIndentation()),
ac, actionName);
actionName = "copy_div_element";
- new KAction(i18n("Copy DIV Area"), 0, this,
+ new TDEAction(i18n("Copy DIV Area"), 0, this,
TQT_SLOT(slotCopyDivElement()),
ac, actionName);
actionName = "cut_div_element";
- new KAction(i18n("Cut DIV Area"), 0, this,
+ new TDEAction(i18n("Cut DIV Area"), 0, this,
TQT_SLOT(slotCutDivElement()),
ac, actionName);
}
@@ -128,11 +128,11 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
m_separator->unplugAll();
- KActionCollection* ac(TagActionManager::self()->actionCollection());
+ TDEActionCollection* ac(TagActionManager::self()->actionCollection());
- KAction* copyDivAction = ac->action("copy_div_element");
+ TDEAction* copyDivAction = ac->action("copy_div_element");
Q_ASSERT(copyDivAction);
- KAction* cutDivAction = ac->action("cut_div_element");
+ TDEAction* cutDivAction = ac->action("cut_div_element");
Q_ASSERT(cutDivAction);
if(/*!KafkaDocument::ref()->getKafkaWidget()->hasSelection() && */isInDivArea())
@@ -151,7 +151,7 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
cutDivAction->unplug(widget);
}
-// KAction* applySourceIndentationAction = ac->action("apply_source_indentation");
+// TDEAction* applySourceIndentationAction = ac->action("apply_source_indentation");
// Q_ASSERT(applySourceIndentationAction);
//
// applySourceIndentationAction->unplug(widget); // to keep things in order
@@ -164,19 +164,19 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
void TagActionSet::unplugAllActions(TQWidget* widget) const
{
- KActionCollection* ac(TagActionManager::self()->actionCollection());
+ TDEActionCollection* ac(TagActionManager::self()->actionCollection());
m_separator->unplugAll();
- KAction* applySourceIndentationAction = ac->action("apply_source_indentation");
+ TDEAction* applySourceIndentationAction = ac->action("apply_source_indentation");
Q_ASSERT(applySourceIndentationAction);
applySourceIndentationAction->unplug(widget);
- KAction* copyDivAction = ac->action("copy_div_element");
+ TDEAction* copyDivAction = ac->action("copy_div_element");
Q_ASSERT(copyDivAction);
copyDivAction->unplug(widget);
- KAction* cutDivAction = ac->action("cut_div_element");
+ TDEAction* cutDivAction = ac->action("cut_div_element");
Q_ASSERT(cutDivAction);
cutDivAction->unplug(widget);
}
@@ -269,7 +269,7 @@ void TagActionSet::slotCutDivElement()
TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name)
: TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
{
- m_separator = new KActionSeparator();
+ m_separator = new TDEActionSeparator();
}
bool TableTagActionSet::isInTagContext() const
@@ -281,9 +281,9 @@ void TableTagActionSet::initActionMenus(TQWidget* widget)
{
Q_ASSERT(!m_tableActionMenu_0);
- m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
- m_insertActionMenu_1 = new KActionMenu(i18n("Insert..."), m_tableActionMenu_0);
- m_removeActionMenu_1 = new KActionMenu(i18n("Remove..."), m_tableActionMenu_0);
+ m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
+ m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0);
+ m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0);
}
@@ -292,37 +292,37 @@ void TableTagActionSet::initActions(TQWidget* parent)
if(!m_tableActionMenu_0)
initActionMenus(parent);
- KActionCollection* ac(TagActionManager::self()->actionCollection());
+ TDEActionCollection* ac(TagActionManager::self()->actionCollection());
// Insert___________________________________________________________________________
const char *actionName = "insert_table";
//m_actionNames += actionName;
- new KAction(i18n("Table..."), 0, this,
+ new TDEAction(i18n("Table..."), 0, this,
TQT_SLOT(slotInsertTable()),
ac, actionName);
actionName = "insert_row_above";
//m_actionNames += actionName;
- new KAction(i18n("Row Above"), 0, this,
+ new TDEAction(i18n("Row Above"), 0, this,
TQT_SLOT(slotInsertRowAbove()),
ac, actionName);
actionName = "insert_row_below";
//m_actionNames += actionName;
- new KAction(i18n("Row Below"), 0, this,
+ new TDEAction(i18n("Row Below"), 0, this,
TQT_SLOT(slotInsertRowBelow()),
ac, actionName);
actionName = "insert_column_left";
//m_actionNames += actionName;
- new KAction(i18n("Column Left"), 0, this,
+ new TDEAction(i18n("Column Left"), 0, this,
TQT_SLOT(slotInsertColumnLeft()),
ac, actionName);
actionName = "insert_column_right";
//m_actionNames += actionName;
- new KAction(i18n("Column Right"), 0, this,
+ new TDEAction(i18n("Column Right"), 0, this,
TQT_SLOT(slotInsertColumnRight()),
ac, actionName);
@@ -330,31 +330,31 @@ void TableTagActionSet::initActions(TQWidget* parent)
actionName = "remove_table";
//m_actionNames += actionName;
- new KAction(i18n("Table"), 0, this,
+ new TDEAction(i18n("Table"), 0, this,
TQT_SLOT(slotRemoveTable()),
ac, actionName);
actionName = "remove_rows";
//m_actionNames += actionName;
- new KAction(i18n("Row(s)"), 0, this,
+ new TDEAction(i18n("Row(s)"), 0, this,
TQT_SLOT(slotRemoveRows()),
ac, actionName);
actionName = "remove_columns";
//m_actionNames += actionName;
- new KAction(i18n("Column(s)"), 0, this,
+ new TDEAction(i18n("Column(s)"), 0, this,
TQT_SLOT(slotRemoveColumns()),
ac, actionName);
actionName = "remove_cells";
//m_actionNames += actionName;
- new KAction(i18n("Cell(s)"), 0, this,
+ new TDEAction(i18n("Cell(s)"), 0, this,
TQT_SLOT(slotRemoveCells()),
ac, actionName);
actionName = "remove_cells_content";
//m_actionNames += actionName;
- new KAction(i18n("Cell(s) Content"), 0, this,
+ new TDEAction(i18n("Cell(s) Content"), 0, this,
TQT_SLOT(slotRemoveCellsContent()),
ac, actionName);
@@ -362,7 +362,7 @@ void TableTagActionSet::initActions(TQWidget* parent)
actionName = "merge_selected_cells";
//m_actionNames += actionName;
- new KAction(i18n("Merge Selected Cells"), 0, this,
+ new TDEAction(i18n("Merge Selected Cells"), 0, this,
TQT_SLOT(slotMergeSelectedCells()),
ac, actionName);
}
@@ -379,7 +379,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
m_separator->unplugAll();
- KActionCollection* ac(TagActionManager::self()->actionCollection());
+ TDEActionCollection* ac(TagActionManager::self()->actionCollection());
// Table
bool emptyTableActionMenu_0 = true;
@@ -390,7 +390,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
bool emptyInsertActionMenu_1 = true;
// Insert Table
- KAction* insertTableAction = ac->action("insert_table");
+ TDEAction* insertTableAction = ac->action("insert_table");
Q_ASSERT(insertTableAction);
m_insertActionMenu_1->remove(insertTableAction);
@@ -402,7 +402,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
m_insertActionMenu_1->insert(m_separator);
}
// Insert Row Above
- KAction* insertRowAboveAction = ac->action("insert_row_above");
+ TDEAction* insertRowAboveAction = ac->action("insert_row_above");
Q_ASSERT(insertRowAboveAction);
m_insertActionMenu_1->remove(insertRowAboveAction);
@@ -414,7 +414,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
//m_insertActionMenu_1->insert(m_separator);
}
// Insert Row Below
- KAction* insertRowBelowAction = ac->action("insert_row_below");
+ TDEAction* insertRowBelowAction = ac->action("insert_row_below");
Q_ASSERT(insertRowBelowAction);
m_insertActionMenu_1->remove(insertRowBelowAction);
@@ -426,7 +426,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
m_insertActionMenu_1->insert(m_separator);
}
// Insert Column Left
- KAction* insertColumnLeftAction = ac->action("insert_column_left");
+ TDEAction* insertColumnLeftAction = ac->action("insert_column_left");
Q_ASSERT(insertColumnLeftAction);
m_insertActionMenu_1->remove(insertColumnLeftAction);
@@ -438,7 +438,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
//m_insertActionMenu_1->insert(m_separator);
}
// Insert Column Right
- KAction* insertColumnRightAction = ac->action("insert_column_right");
+ TDEAction* insertColumnRightAction = ac->action("insert_column_right");
Q_ASSERT(insertColumnRightAction);
m_insertActionMenu_1->remove(insertColumnRightAction);
@@ -455,7 +455,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
bool emptyRemoveActionMenu_1 = true;
// Remove Table
- KAction* removeTableAction = ac->action("remove_table");
+ TDEAction* removeTableAction = ac->action("remove_table");
Q_ASSERT(removeTableAction);
m_removeActionMenu_1->remove(removeTableAction);
@@ -467,7 +467,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
m_removeActionMenu_1->insert(m_separator);
}
// Remove Row(s)
- KAction* removeRowsAction = ac->action("remove_rows");
+ TDEAction* removeRowsAction = ac->action("remove_rows");
Q_ASSERT(removeRowsAction);
m_removeActionMenu_1->remove(removeRowsAction);
@@ -479,7 +479,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
//m_removeActionMenu_1->insert(m_separator);
}
// Remove Column(s)
- KAction* removeColumnsAction = ac->action("remove_columns");
+ TDEAction* removeColumnsAction = ac->action("remove_columns");
Q_ASSERT(removeColumnsAction);
m_removeActionMenu_1->remove(removeColumnsAction);
@@ -491,7 +491,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
//m_removeActionMenu_1->insert(m_separator);
}
/* // Remove Cell(s)
- KAction* removeCellsAction = ac->action("remove_cells");
+ TDEAction* removeCellsAction = ac->action("remove_cells");
Q_ASSERT(removeCellsAction);
m_removeActionMenu_1->remove(removeCellsAction);
@@ -503,7 +503,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
//m_removeActionMenu_1->insert(m_separator);
}*/
// Remove Cell(s) Content
- KAction* removeCellsContentAction = ac->action("remove_cells_content");
+ TDEAction* removeCellsContentAction = ac->action("remove_cells_content");
Q_ASSERT(removeCellsContentAction);
m_removeActionMenu_1->remove(removeCellsContentAction);
@@ -538,7 +538,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
m_tableActionMenu_0->insert(m_separator);
}
// Merge selected cells
- KAction* mergeSelectedCellsAction = ac->action("merge_selected_cells");
+ TDEAction* mergeSelectedCellsAction = ac->action("merge_selected_cells");
Q_ASSERT(mergeSelectedCellsAction);
m_tableActionMenu_0->remove(mergeSelectedCellsAction);
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index 19b06fb7..f94506a5 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -22,12 +22,12 @@ namespace DOM
{
class Node;
}
-class KActionSeparator;
+class TDEActionSeparator;
#include <tqobject.h>
class TQWidget;
-class KActionSet;
-class KActionMenu;
+class TDEActionSet;
+class TDEActionMenu;
class Node;
class NodeModifsSet;
@@ -89,7 +89,7 @@ private:
bool isInDivArea() const;
private:
- KActionSeparator* m_separator;
+ TDEActionSeparator* m_separator;
};
@@ -154,11 +154,11 @@ private:
void clearCellContents(Node* tdNode, NodeModifsSet* modifs);
private:
- KActionSeparator* m_separator;
+ TDEActionSeparator* m_separator;
- KActionMenu* m_tableActionMenu_0;
- KActionMenu* m_insertActionMenu_1;
- KActionMenu* m_removeActionMenu_1;
+ TDEActionMenu* m_tableActionMenu_0;
+ TDEActionMenu* m_insertActionMenu_1;
+ TDEActionMenu* m_removeActionMenu_1;
};
#endif
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index c594c46b..6d715d64 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -41,7 +41,7 @@
ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f)
:TQTabWidget(parent, name, f)
{
- m_popupMenu = new KPopupMenu(this);
+ m_popupMenu = new TDEPopupMenu(this);
m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
m_popupMenu->insertSeparator();
@@ -60,12 +60,12 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags
parent, TQT_SLOT(slotNewAction()));
connect(this, TQT_SIGNAL(addToolbar()),
parent, TQT_SLOT(slotAddToolbar()));
- KAcceleratorManager::setNoAccel(this);
+ TDEAcceleratorManager::setNoAccel(this);
}
void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id)
{
- if (child->inherits("KToolBar") && child->parentWidget())
+ if (child->inherits("TDEToolBar") && child->parentWidget())
{
TQTabWidget::insertTab(child->parentWidget(), label);
toolbarList.insert(id, child);
@@ -125,7 +125,7 @@ TQWidget* ToolbarTabWidget::page(const TQString& id)
void ToolbarTabWidget::removePage(TQWidget * w)
{
TQWidget *parent = w->parentWidget();
- if (w->inherits("KToolBar") && parent)
+ if (w->inherits("TDEToolBar") && parent)
{
TQTabWidget::removePage(parent);
for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
@@ -224,12 +224,12 @@ int ToolbarTabWidget::tabHeight() const
QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig)
-:KToolBar (parent, name=0, honor_style, readConfig)
+:TDEToolBar (parent, name=0, honor_style, readConfig)
{
- m_popupMenu = new KPopupMenu(this);
+ m_popupMenu = new TDEPopupMenu(this);
m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(parent->parentWidget());
currentActionName = "";
- m_iconTextMenu = new KPopupMenu(this);
+ m_iconTextMenu = new TDEPopupMenu(this);
m_iconTextMenu->setCheckable(true);
m_iconTextMenu->insertItem(i18n("Icons Only"), 0);
m_iconTextMenu->insertItem(i18n("Text Only"), 1);
@@ -307,10 +307,10 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - "
+ i18n(m_toolbarTab->tabUnderMouseLabel.utf8()));
m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction()));
- TQObjectList* childrenList = queryList("KToolBarButton");
+ TQObjectList* childrenList = queryList("TDEToolBarButton");
for (uint i = 0; i < childrenList->count(); i++)
{
- KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
+ TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
if (TQRect(p1, p2).contains(p))
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index 24d09e36..a8ce9ecc 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -19,10 +19,10 @@
#include <tqmap.h>
class TQTabWidget;
-class KPopupMenu;
+class TDEPopupMenu;
class TQWidgetStack;
class TQTabBar;
-class KToolBar;
+class TDEToolBar;
class ToolbarTabWidget: public TQTabWidget
{
@@ -45,8 +45,8 @@ public:
int tabHeight() const;
TQString id(TQWidget *w) const;
TQString id(int index) const;
- KToolBar::IconText iconText() const {return m_iconText;}
- void setIconText(KToolBar::IconText mode) {m_iconText = mode; emit iconTextModeChanged();}
+ TDEToolBar::IconText iconText() const {return m_iconText;}
+ void setIconText(TDEToolBar::IconText mode) {m_iconText = mode; emit iconTextModeChanged();}
public slots:
virtual void removePage(TQWidget * w );
@@ -72,17 +72,17 @@ public:
protected:
virtual void mousePressEvent ( TQMouseEvent * e );
- KPopupMenu *m_popupMenu;
+ TDEPopupMenu *m_popupMenu;
TQTabBar *m_tabBar;
TQMap<TQString, TQWidget*> toolbarList;
private:
ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
- KToolBar::IconText m_iconText;
+ TDEToolBar::IconText m_iconText;
};
-class QuantaToolBar: public KToolBar
+class QuantaToolBar: public TDEToolBar
{
Q_OBJECT
@@ -104,8 +104,8 @@ signals:
protected:
virtual void mousePressEvent ( TQMouseEvent * e );
- KPopupMenu *m_popupMenu;
- KPopupMenu *m_iconTextMenu;
+ TDEPopupMenu *m_popupMenu;
+ TDEPopupMenu *m_iconTextMenu;
ToolbarTabWidget *m_toolbarTab;
TQString currentActionName;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 15:29:37 +0000