From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- quanta/DESIGN | 4 +- quanta/components/csseditor/colorrequester.cpp | 4 +- quanta/components/cvsservice/cvscommitdlgs.ui | 2 +- quanta/components/cvsservice/cvsservice.cpp | 26 ++-- quanta/components/cvsservice/cvsservice.h | 12 +- quanta/components/debugger/backtracelistview.cpp | 6 +- quanta/components/debugger/backtracelistview.h | 4 +- .../components/debugger/debuggerbreakpointview.cpp | 12 +- .../components/debugger/debuggerbreakpointview.h | 8 +- quanta/components/debugger/debuggermanager.cpp | 46 +++--- quanta/components/debugger/debuggervariable.h | 6 +- quanta/components/debugger/variableslistview.cpp | 16 +-- quanta/components/debugger/variableslistview.h | 6 +- quanta/components/tableeditor/tableeditor.cpp | 2 +- quanta/components/tableeditor/tableeditor.h | 4 +- quanta/dialogs/actionconfigdialog.cpp | 58 ++++---- quanta/dialogs/actionconfigdialog.h | 24 ++-- quanta/dialogs/actionconfigdialogs.ui | 4 +- quanta/dialogs/settings/abbreviation.cpp | 4 +- quanta/dialogs/settings/abbreviations.ui | 4 +- quanta/dialogs/specialchardialogs.ui | 2 +- quanta/dialogs/tagdialogs/listdlg.cpp | 2 +- quanta/dialogs/tagdialogs/listdlg.h | 4 +- quanta/messages/annotationoutput.cpp | 20 +-- quanta/messages/annotationoutput.h | 14 +- quanta/messages/messageoutput.cpp | 2 +- quanta/messages/messageoutput.h | 4 +- quanta/parts/kafka/domtreeview.cpp | 2 +- quanta/parts/kafka/domtreeview.h | 4 +- quanta/parts/kafka/htmldocumentproperties.cpp | 2 +- quanta/parts/kafka/kafkahtmlpart.cpp | 2 +- quanta/parts/preview/whtmlpart.cpp | 2 +- quanta/parts/preview/whtmlpart.h | 4 +- quanta/plugins/quantaplugin.cpp | 2 +- quanta/plugins/quantaplugin.h | 4 +- quanta/plugins/quantaplugininterface.cpp | 4 +- quanta/project/eventconfigurationdlg.cpp | 2 +- quanta/project/eventconfigurationdlg.h | 6 +- quanta/project/eventconfigurationdlgs.ui | 2 +- quanta/project/eventeditordlg.cpp | 4 +- quanta/project/eventeditordlg.h | 6 +- quanta/project/project.cpp | 2 +- quanta/project/project.h | 6 +- quanta/project/projectprivate.cpp | 30 ++-- quanta/project/projectprivate.h | 18 +-- quanta/project/teammembersdlgs.ui | 2 +- quanta/quanta_uml.xmi | 104 +++++++------- quanta/src/document.cpp | 4 +- quanta/src/quanta.cpp | 50 +++---- quanta/src/quanta.h | 26 ++-- quanta/src/quanta_init.cpp | 158 ++++++++++----------- quanta/src/quantadoc.cpp | 6 +- quanta/src/quantadoc.h | 2 +- quanta/src/quantaview.cpp | 18 +-- quanta/src/viewmanager.cpp | 6 +- quanta/src/viewmanager.h | 8 +- quanta/treeviews/basetreeview.cpp | 12 +- quanta/treeviews/basetreeview.h | 10 +- quanta/treeviews/docfolder.cpp | 4 +- quanta/treeviews/docfolder.h | 2 +- quanta/treeviews/docitem.cpp | 4 +- quanta/treeviews/docitem.h | 2 +- quanta/treeviews/doctreeview.cpp | 12 +- quanta/treeviews/doctreeview.h | 10 +- quanta/treeviews/filestreeview.cpp | 14 +- quanta/treeviews/filestreeview.h | 10 +- quanta/treeviews/projecttreeview.cpp | 18 +-- quanta/treeviews/projecttreeview.h | 10 +- quanta/treeviews/scripttreeview.cpp | 10 +- quanta/treeviews/scripttreeview.h | 8 +- quanta/treeviews/servertreeview.cpp | 10 +- quanta/treeviews/servertreeview.h | 8 +- quanta/treeviews/structtreetag.cpp | 6 +- quanta/treeviews/structtreetag.h | 2 +- quanta/treeviews/structtreeview.cpp | 12 +- quanta/treeviews/structtreeview.h | 10 +- quanta/treeviews/tagattributeitems.cpp | 24 ++-- quanta/treeviews/tagattributeitems.h | 14 +- quanta/treeviews/tagattributetree.cpp | 14 +- quanta/treeviews/tagattributetree.h | 4 +- quanta/treeviews/templatestreeview.cpp | 18 +-- quanta/treeviews/templatestreeview.h | 18 +-- quanta/treeviews/uploadtreefile.cpp | 4 +- quanta/treeviews/uploadtreefile.h | 2 +- quanta/treeviews/uploadtreefolder.cpp | 4 +- quanta/treeviews/uploadtreefolder.h | 2 +- quanta/treeviews/uploadtreeview.cpp | 2 +- quanta/treeviews/uploadtreeview.h | 2 +- quanta/utility/qpevents.cpp | 2 +- quanta/utility/quantabookmarks.cpp | 14 +- quanta/utility/quantabookmarks.h | 18 +-- quanta/utility/quantacommon.h | 2 +- quanta/utility/tagaction.cpp | 18 +-- quanta/utility/tagaction.h | 14 +- quanta/utility/tagactionmanager.cpp | 2 +- quanta/utility/tagactionmanager.h | 6 +- quanta/utility/tagactionset.cpp | 82 +++++------ quanta/utility/tagactionset.h | 16 +-- quanta/utility/toolbartabwidget.cpp | 18 +-- quanta/utility/toolbartabwidget.h | 18 +-- 100 files changed, 639 insertions(+), 639 deletions(-) (limited to 'quanta') diff --git a/quanta/DESIGN b/quanta/DESIGN index 892c2c8b..6d367c18 100644 --- a/quanta/DESIGN +++ b/quanta/DESIGN @@ -150,11 +150,11 @@ QConfig: holds the Quanta configuration settings. QuantaToolBar/ToolbarTabWidget/ToolbarXMLGUI: classes needed to make the user toolbars work. -TagAction: an extended KAction, which can be modified in Quanta. May be of three +TagAction: an extended TDEAction, which can be modified in Quanta. May be of three types: Tag, Script, Text. Script actions can be executed in synchronous (execute) or async. mode (insertTag). TagActions are usually put on the user toolbars and under Tags menu, but they can be plugged anywhere - just like the normal KActions. + just like the normal TDEActions. 4. treeviews directory diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index be7aba50..004f4c74 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -71,8 +71,8 @@ void colorRequester::init() connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); - KAccel *accel = new KAccel( this ); - accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); + TDEAccel *accel = new TDEAccel( this ); + accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); accel->readSettings(); } diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index ad33e4f4..6f79a85e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -28,7 +28,7 @@ unnamed - + fileList diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 58f7d667..e423a221 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -44,33 +44,33 @@ #define CVSSERVICE_TIMEOUT 1000*60 -CVSService::CVSService(KActionCollection *ac) +CVSService::CVSService(TDEActionCollection *ac) { - m_menu = new KPopupMenu(); - KAction *action = new KAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit"); + m_menu = new TDEPopupMenu(); + TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit"); action->plug(m_menu); - action = new KAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update"); + action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update"); action->plug(m_menu); - KPopupMenu *updateToMenu = new KPopupMenu(m_menu); + TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu); m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu); - action = new KAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); + action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); action->plug(updateToMenu); - action = new KAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); + action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); action->plug(updateToMenu); - action = new KAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert"); + action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert"); action->plug(m_menu); m_menu->insertSeparator(); - action = new KAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add"); + action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add"); action->plug(m_menu); - action = new KAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove"); + action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove"); action->plug(m_menu); - action = new KAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac); + action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac); action->plug(m_menu); - action = new KAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac); + action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac); action->plug(m_menu); m_menu->insertSeparator(); - action = new KAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac); + action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac); action->plug(m_menu); m_cvsJob = 0L; diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 4ff92cbe..5c12d91a 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -26,8 +26,8 @@ #include "cvsservicedcopif.h" class TQTimer; -class KPopupMenu; -class KActionCollection; +class TDEPopupMenu; +class TDEActionCollection; class CvsJob_stub; class CvsService_stub; class Repository_stub; @@ -49,7 +49,7 @@ public: * since this class is a singleton you must use this function to access it * @return the class pointer */ - static CVSService* ref(KActionCollection *ac = 0L) + static CVSService* ref(TDEActionCollection *ac = 0L) { static CVSService *m_ref; if (!m_ref) m_ref = new CVSService(ac); @@ -63,7 +63,7 @@ public: bool exists() {return !m_appId.isEmpty();} void setRepository(const TQString &repository); void setCurrentFile(const TQString &file) {m_defaultFile = file;} - KPopupMenu *menu() {return m_menu;} + TDEPopupMenu *menu() {return m_menu;} public slots: void slotUpdate(); @@ -97,12 +97,12 @@ private slots: void slotTimeout(); private: - CVSService(KActionCollection *ac); + CVSService(TDEActionCollection *ac); void notInRepository(); void startService(); TQCString m_appId; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; Repository_stub *m_repository; CvsJob_stub *m_cvsJob; CvsService_stub *m_cvsService; diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index cd3b3e35..a5925c26 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -44,13 +44,13 @@ namespace BacktraceListviewColumns } BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view) - : KListViewItem(view) + : TDEListViewItem(view) { } BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { int charwidth = this->fontMetrics().width("0"); // If you change the order here, change the BacktraceListviewColumns enums above @@ -103,7 +103,7 @@ void BacktraceListview::keyPressEvent(TQKeyEvent *e) void BacktraceListview::clear() { - KListView::clear(); + TDEListView::clear(); } void BacktraceListview::slotBacktraceDoubleClick(TQListViewItem *item, const TQPoint &, int ) diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 0661af1a..4203cf70 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -33,7 +33,7 @@ enum BacktraceType }; -class BacktraceListviewItem : public KListViewItem +class BacktraceListviewItem : public TDEListViewItem { private: BacktraceType m_type; @@ -68,7 +68,7 @@ class BacktraceListviewItem : public KListViewItem }; -class BacktraceListview : public KListView +class BacktraceListview : public TDEListView { Q_OBJECT diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index d490478d..c1074e9d 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -47,13 +47,13 @@ namespace DebuggerBreakpointViewColumns } DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* view) - : KListViewItem(view) + : TDEListViewItem(view) { } DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { // If you change here, change the DebuggerBreakpointViewColumns enums above addColumn(i18n("Expression")); @@ -66,10 +66,10 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam setResizeMode(TQListView::AllColumns); setAllColumnsShowFocus(true); - m_breakpointPopup = new KPopupMenu(this); + m_breakpointPopup = new TDEPopupMenu(this); m_breakpointPopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); - connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); // Jump to bp connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); @@ -165,7 +165,7 @@ void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e) void DebuggerBreakpointView::clear() { - KListView::clear(); + TDEListView::clear(); } void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &, int ) @@ -182,7 +182,7 @@ void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, con } -void DebuggerBreakpointView::slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint& point) +void DebuggerBreakpointView::slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point) { if(!selectedItem()) return; diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 9724cec5..e6abcfcd 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -27,7 +27,7 @@ // class DebuggerBreakpoint; class DebuggerBreakpointView; -class DebuggerBreakpointViewItem : public KListViewItem +class DebuggerBreakpointViewItem : public TDEListViewItem { private: DebuggerBreakpoint m_breakpoint; @@ -41,7 +41,7 @@ class DebuggerBreakpointViewItem : public KListViewItem }; -class DebuggerBreakpointView : public KListView +class DebuggerBreakpointView : public TDEListView { Q_OBJECT @@ -59,7 +59,7 @@ class DebuggerBreakpointView : public KListView public slots: void slotRemoveSelected(); - void slotBreakpointContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point); + void slotBreakpointContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point); void slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &point, int column); signals: @@ -69,7 +69,7 @@ class DebuggerBreakpointView : public KListView void keyPressEvent(TQKeyEvent *e); TQListViewItem* findBreakpoint(const DebuggerBreakpoint& bp, bool addIfNotExist = true); - KPopupMenu *m_breakpointPopup; + TDEPopupMenu *m_breakpointPopup; }; #endif diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index e9b9573a..bdab1245 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -206,71 +206,71 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU void DebuggerManager::initActions() { - KAction * newaction; - KActionCollection *ac = quantaApp->actionCollection(); + TDEAction * newaction; + TDEActionCollection *ac = quantaApp->actionCollection(); if(!ac) return; //Debugger, breakpoint - newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); - newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); + newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); newaction->setToolTip(i18n("Clears all breakpoints")); - newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); - newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); // Execution - newaction = new KAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request"); + newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request"); newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated")); - newaction = new KAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace"); + newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace"); newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started")); - newaction = new KAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run"); + newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run"); newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started")); - newaction = new KAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover"); + newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover"); newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes")); - newaction = new KAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); + newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file")); - newaction = new KAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip"); + newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip"); newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one")); - newaction = new KAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout"); + newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout"); newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)")); - newaction = new KAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause"); + newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause"); newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started")); - newaction = new KAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill"); + newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill"); newaction->setToolTip(i18n("Kills the currently running script")); - newaction = new KAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect"); + newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect"); newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)")); - newaction = new KAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); + newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)")); // Variables - newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new KAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); + newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); newaction->setToolTip(i18n("Opens the profiler output file")); enableAction("*", false); @@ -340,7 +340,7 @@ void DebuggerManager::enableAction(const TQString& action, bool enable) else { // The action may or may not exist, depending on capabilities of the debugger plugin - KActionCollection *ac = quantaApp->actionCollection(); + TDEActionCollection *ac = quantaApp->actionCollection(); if(ac && ac->action(action.ascii())) ac->action(action.ascii())->setEnabled(enable); } diff --git a/quanta/components/debugger/debuggervariable.h b/quanta/components/debugger/debuggervariable.h index 50d28136..af78fde6 100644 --- a/quanta/components/debugger/debuggervariable.h +++ b/quanta/components/debugger/debuggervariable.h @@ -80,8 +80,8 @@ class DebuggerVariable virtual void touch() { m_touched = true;}; virtual bool touched() const { return m_touched;}; - virtual void setItem(KListViewItem* item) { m_item = item;}; - virtual KListViewItem* item() const{ return m_item;}; + virtual void setItem(TDEListViewItem* item) { m_item = item;}; + virtual TDEListViewItem* item() const{ return m_item;}; virtual void copy(DebuggerVariable* v, bool copychldren = true); virtual void append(DebuggerVariable* v); @@ -98,6 +98,6 @@ class DebuggerVariable int m_type; long m_touched; - KListViewItem* m_item; + TDEListViewItem* m_item; }; #endif diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 40df91c0..04eb90a1 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -48,7 +48,7 @@ namespace VariablesListViewColumns } VariablesListView::VariablesListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { // If you change here, change the VariablesListViewColumns enums above addColumn(i18n("Name")); @@ -59,7 +59,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) setRootIsDecorated(true); setSorting(-1); // No sorting - m_variablePopup = new KPopupMenu(this); + m_variablePopup = new TDEPopupMenu(this); m_variablePopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue)) @@ -69,7 +69,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) m_variablePopup->insertItem(SmallIcon("editcopy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); - connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); } @@ -144,7 +144,7 @@ void VariablesListView::addVariable(DebuggerVariable* variable) DebuggerVariable *newvar = new DebuggerVariable(variable); m_variablesList.append(newvar); - KListViewItem * item = new KListViewItem(this); + TDEListViewItem * item = new TDEListViewItem(this); insertItem(item); newvar->setItem(item); replaceVariable(newvar, variable); @@ -152,13 +152,13 @@ void VariablesListView::addVariable(DebuggerVariable* variable) void VariablesListView::clear() { - KListView::clear(); + TDEListView::clear(); m_variablesList.clear(); } void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar) { - KListViewItem * item; + TDEListViewItem * item; // Remove children that doesen't exist anymore TQPtrList oldlist = oldvar->values(); @@ -196,7 +196,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab if(!found) { DebuggerVariable* child = new DebuggerVariable(); - item = new KListViewItem(oldvar->item()); + item = new TDEListViewItem(oldvar->item()); child->setItem(item); replaceVariable( child, newchild); oldvar->append(child); @@ -219,7 +219,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab } -void VariablesListView::slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint& point) +void VariablesListView::slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point) { if(!selectedItem()) return; diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index af3db373..de837241 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -25,7 +25,7 @@ class DebuggerVariable; -class VariablesListView : public KListView +class VariablesListView : public TDEListView { Q_OBJECT @@ -55,7 +55,7 @@ class VariablesListView : public KListView void slotVariableSetValue(); void slotVariableDump(); void slotVariableCopyToClipboard(); - void slotVariableContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point); + void slotVariableContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point); signals: void valueChanged(DebuggerVariable*); @@ -66,7 +66,7 @@ class VariablesListView : public KListView void replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar); TQPtrList m_variablesList; - KPopupMenu *m_variablePopup; + TDEPopupMenu *m_variablePopup; }; #endif diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 60eb455e..c53d87b1 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -51,7 +51,7 @@ int newNum; TableEditor::TableEditor(TQWidget* parent, const char* name) : TableEditorS(parent, name) { - m_popup = new KPopupMenu(); + m_popup = new TDEPopupMenu(); m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow())); // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol())); diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index c97f9ca0..171cb9c1 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -23,7 +23,7 @@ class TQSpinBox; class TQTable; -class KPopupMenu; +class TDEPopupMenu; class Tag; struct DTDStruct; class Node; @@ -109,7 +109,7 @@ protected: int m_cellEditId; int m_col; int m_row; - KPopupMenu *m_popup; + TDEPopupMenu *m_popup; KURL m_baseURL; const DTDStruct *m_dtd; TQValueList > *m_tableDataTags; diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 9654c046..4346be52 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -50,7 +50,7 @@ #include "tagaction.h" #include "toolbartabwidget.h" -ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) +ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, TDEMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) :ActionConfigDialogS( parent, name, modal, fl ) { m_mainWindow = parent; @@ -63,34 +63,34 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(KListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(KListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const KShortcut &)), - TQT_SLOT(slotShortcutCaptured(const KShortcut &))); + connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(KAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(KAction*))); + connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); - allActionsItem = new KListViewItem(actionTreeView, i18n("All")); + allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); actionTreeView->insertItem(allActionsItem); TQListViewItem *item, *oldItem = allActionsItem; - KAction *action; + TDEAction *action; TQString toolbarName; TQString toolbarId; ToolbarTabWidget *tb = ToolbarTabWidget::ref(); TQRegExp r("\\&(?!\\&)"); - KActionCollection *ac = m_mainWindow->actionCollection(); + TDEActionCollection *ac = m_mainWindow->actionCollection(); for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); toolbarName.replace(r, ""); - item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8())); + item = new TDEListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8())); actionTreeView->insertItem(item); toolbarId = tb->id(i); @@ -106,7 +106,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name()); + oldActionItem = new TDEListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name()); oldActionItem->setPixmap(0, SmallIcon(action->icon()) ); } } @@ -142,12 +142,12 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, for (uint i = 0; i < acCount; i++) { action = ac->action(i); - item = new KListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name()); + item = new TDEListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name()); item->setPixmap(0, SmallIcon(action->icon()) ); } allActionsItem->sortChildItems(0, true); - treeMenu = new KPopupMenu(actionTreeView); + treeMenu = new TDEPopupMenu(actionTreeView); treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); @@ -173,7 +173,7 @@ void ActionConfigDialog::slotAddToolbar() item = actionTreeView->lastItem(); if (item->parent()) item = item->parent(); - new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8())); + new TDEListViewItem(actionTreeView, item, i18n(toolbarName.utf8())); break; } } @@ -221,8 +221,8 @@ void ActionConfigDialog::slotEditToolbar() emit configureToolbars(toolbarName +" "); //update the tree view - KAction *action; - KActionCollection *ac = m_mainWindow->actionCollection(); + TDEAction *action; + TDEActionCollection *ac = m_mainWindow->actionCollection(); ToolbarTabWidget *tb = ToolbarTabWidget::ref(); for (int i = 0; i < tb->count(); i++) { @@ -232,7 +232,7 @@ void ActionConfigDialog::slotEditToolbar() if (p_toolbar) { oldItem = actionTreeView->findItem(toolbarName, 0); - item = new KListViewItem(actionTreeView, oldItem, toolbarName); + item = new TDEListViewItem(actionTreeView, oldItem, toolbarName); item->setOpen(oldItem->isOpen()); delete oldItem; TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild(); @@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar() action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); + oldItem = new TDEListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); oldItem->setPixmap(0, SmallIcon(action->icon())); } } @@ -256,7 +256,7 @@ void ActionConfigDialog::slotEditToolbar() } } -void ActionConfigDialog::slotContextMenu(KListView *,TQListViewItem *,const TQPoint &point) +void ActionConfigDialog::slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &point) { treeMenu->popup(point); } @@ -276,12 +276,12 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) if (item && item->depth() > 0) { TagAction *action = 0L; - KActionCollection *ac = m_mainWindow->actionCollection(); + TDEActionCollection *ac = m_mainWindow->actionCollection(); uint acCount = ac->count(); //find the corresponding action for (uint i = 0; i < acCount; i++) { - KAction *a = ac->action(i); + TDEAction *a = ac->action(i); TQString actionName = a->name(); if (a && actionName == item->text(2) && a->inherits("TagAction")) { @@ -485,7 +485,7 @@ void ActionConfigDialog::saveCurrentAction() currentAction->setShortcut(selectedShortcut); } else { - currentAction->setShortcut(KShortcut()); + currentAction->setShortcut(TDEShortcut()); } el.setAttribute("shortcut", s); @@ -673,7 +673,7 @@ void ActionConfigDialog::saveCurrentAction() } if (placeOnToolbar) { - listItem = new KListViewItem(listItem, after, lineText->text(), currentAction->shortcut().toString(), currentAction->name()); + listItem = new TDEListViewItem(listItem, after, lineText->text(), currentAction->shortcut().toString(), currentAction->name()); listItem->setPixmap(0, SmallIcon(actionIcon->icon())); } } @@ -694,7 +694,7 @@ void ActionConfigDialog::saveCurrentAction() } } -void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) +void ActionConfigDialog::slotShortcutCaptured(const TDEShortcut &shortcut) { TQString shortcutText = shortcut.toString(); TQString shortcutText2; @@ -733,10 +733,10 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) TQPtrList clients = m_mainWindow->guiFactory()->clients(); for( TQPtrListIterator it( clients ); it.current(); ++it ) { - KActionCollection *ac = (*it)->actionCollection(); + TDEActionCollection *ac = (*it)->actionCollection(); for (uint i = 0; i < ac->count(); i++) { - KAction *action = ac->action(i); + TDEAction *action = ac->action(i); if (action != currentAction && action->shortcut().toString().contains(shortcutRx)) { global = action->text(); @@ -801,10 +801,10 @@ void ActionConfigDialog::slotNewAction() ++it; } - selectedShortcut = KShortcut(); + selectedShortcut = TDEShortcut(); static_cast(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); - TQListViewItem *item = new KListViewItem(allActionsItem); + TQListViewItem *item = new TDEListViewItem(allActionsItem); TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); @@ -820,7 +820,7 @@ void ActionConfigDialog::slotNewAction() if (!parentItem) parentItem = currentItem; - item = new KListViewItem(parentItem, currentItem); + item = new TDEListViewItem(parentItem, currentItem); item->setText(0, actionText); item->setText(2, currentAction->name()); item->setPixmap(0, SmallIcon("ball")); diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index 97125f3d..853d839a 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -21,10 +21,10 @@ class TQDomDocument; class TQPopupMenu; -class KAction; -class KMainWindow; -class KPopupMenu; -class KShortcut; +class TDEAction; +class TDEMainWindow; +class TDEPopupMenu; +class TDEShortcut; class KXMLGUIClient; struct ToolbarEntry { @@ -46,7 +46,7 @@ class ActionConfigDialog: public ActionConfigDialogS public: - ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); + ActionConfigDialog(const TQDict &toolbarList, TDEMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); ~ActionConfigDialog(); void createScriptAction(const TQString& a_name, const TQString& a_script); @@ -62,9 +62,9 @@ private slots: void slotAddToolbar(); void slotRemoveToolbar(); void slotEditToolbar(); - void slotContextMenu(KListView *,TQListViewItem *,const TQPoint &); + void slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &); void slotSelectionChanged(TQListViewItem *); - void slotShortcutCaptured(const KShortcut&); + void slotShortcutCaptured(const TDEShortcut&); void slotDeleteAction(); void slotApply(); void slotAddContainerToolbar(); @@ -74,18 +74,18 @@ private slots: signals: void addToolbar(); void removeToolbar(const TQString&); - void deleteUserAction(KAction *); + void deleteUserAction(TDEAction *); void configureToolbars(const TQString&); private: void saveCurrentAction(); - KPopupMenu *treeMenu; - KAction *currentAction; + TDEPopupMenu *treeMenu; + TDEAction *currentAction; TQListViewItem *allActionsItem; TQMap globalShortcuts; - KShortcut selectedShortcut; - KMainWindow *m_mainWindow; + TDEShortcut selectedShortcut; + TDEMainWindow *m_mainWindow; TQDict m_toolbarList; TQListViewItem *m_toolbarItem; }; diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index f642719c..9ed82302 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -117,7 +117,7 @@ Toolbar & Action Tree - + Name @@ -378,7 +378,7 @@ - + toolbarListBox diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index eb143120..90e098b8 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -78,7 +78,7 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName) templateStr = it.key(); templateName = templateStr.mid(templateStr.find(' ') + 1); templateStr = templateStr.left(templateStr.find(' ')); - new KListViewItem(templatesList, templateStr, templateName); + new TDEListViewItem(templatesList, templateStr, templateName); } for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit ) { @@ -174,7 +174,7 @@ void AbbreviationDlg::slotAddTemplate() TQString description = w.descriptionEdit->text(); if (!templateName.isEmpty()) { - TQListViewItem *item = new KListViewItem(templatesList, templateName, description); + TQListViewItem *item = new TDEListViewItem(templatesList, templateName, description); templatesList->setCurrentItem(item); templatesList->setSelected(item, true); templatesList->ensureItemVisible(item); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 24edbaa8..f283a092 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -111,7 +111,7 @@ PlainText - + Template @@ -229,7 +229,7 @@ templatesList - + dtepList diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index d29bd1ba..caaf3848 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -129,7 +129,7 @@ - + CharsListBox diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 1544b6d8..ba583b99 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -25,7 +25,7 @@ #include ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) - :KDialogBase(parent,name), listbox(new KListBox(this)) + :KDialogBase(parent,name), listbox(new TDEListBox(this)) { TQ_CHECK_PTR(listbox); setMainWidget(listbox); diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index eaf46a79..3d190ae7 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -21,7 +21,7 @@ class TQPushButton; class TQString; class TQStringList; -class KListBox; +class TDEListBox; /**Select an item from a list. The list is given in the constructor as a parameter. After calling @@ -40,7 +40,7 @@ public: int getEntryNum(); private: // Private attributes /** */ - KListBox * listbox; + TDEListBox * listbox; }; #endif diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index e42eef5d..7ded7062 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -41,7 +41,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_currentFileAnnotations = new MessageOutput(this); addTab(m_currentFileAnnotations, i18n("Current File")); - m_yourAnnotations = new KListView(this); + m_yourAnnotations = new TDEListView(this); m_yourAnnotations->addColumn("1", -1); m_yourAnnotations->addColumn("2", 0); m_yourAnnotations->setRootIsDecorated(true); @@ -52,7 +52,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); - m_allAnnotations = new KListView(this); + m_allAnnotations = new TDEListView(this); m_allAnnotations->addColumn("1", -1); m_allAnnotations->addColumn("2", 0); m_allAnnotations->setRootIsDecorated(true); @@ -162,14 +162,14 @@ void AnnotationOutput::readAnnotations() s.fill('0', 20 - lineText.length()); lineText.prepend(s); } - KListViewItem *fileIt = m_annotatedFileItems[fileName]; + TDEListViewItem *fileIt = m_annotatedFileItems[fileName]; if (!fileIt) { - fileIt = new KListViewItem(m_allAnnotations, fileName); + fileIt = new TDEListViewItem(m_allAnnotations, fileName); m_annotatedFileItems.insert(fileName, fileIt); m_fileNames[fileIt] = u.url(); } - KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); + TDEListViewItem *it = new TDEListViewItem(fileIt, fileIt, text, lineText); if (openedItems.contains(fileName)) fileIt->setOpen(true); m_fileNames[it] = u.url(); @@ -178,14 +178,14 @@ void AnnotationOutput::readAnnotations() if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver))) { m_yourAnnotationsNum++; - KListViewItem *fileIt = m_yourFileItems[fileName]; + TDEListViewItem *fileIt = m_yourFileItems[fileName]; if (!fileIt) { - fileIt = new KListViewItem(m_yourAnnotations, fileName); + fileIt = new TDEListViewItem(m_yourAnnotations, fileName); m_yourFileItems.insert(fileName, fileIt); m_yourFileNames[fileIt] = u.url(); } - KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); + TDEListViewItem *it = new TDEListViewItem(fileIt, fileIt, text, lineText); if (yourOpenedItems.contains(fileName)) fileIt->setOpen(true); m_yourFileNames[it] = u.url(); @@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap (item->parent()) != m_allAnnotations) + if (dynamic_cast (item->parent()) != m_allAnnotations) { emit clicked(m_fileNames[item], m_lines[item], 0); } else @@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast (item->parent()) != m_yourAnnotations) + if (dynamic_cast (item->parent()) != m_yourAnnotations) { emit clicked(m_yourFileNames[item], m_yourLines[item], 0); } else diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 352f046d..850b3e7c 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -23,8 +23,8 @@ class TQDomDocument; class TQListViewItem; class TQTimer; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class MessageOutput; @@ -43,7 +43,7 @@ public: ~AnnotationOutput(); MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;} - KListView *allAnnotations() const {return m_allAnnotations;} + TDEListView *allAnnotations() const {return m_allAnnotations;} void writeAnnotations(const TQString &fileName, const TQMap > &annotations); public slots: @@ -72,14 +72,14 @@ private: void updateAnnotationForFile(const KURL& url); MessageOutput *m_currentFileAnnotations; - KListView *m_allAnnotations; - TQDict m_annotatedFileItems; + TDEListView *m_allAnnotations; + TQDict m_annotatedFileItems; TQMap m_fileNames; TQMap m_lines; uint m_yourAnnotationsNum; - KListView *m_yourAnnotations; - TQDict m_yourFileItems; + TDEListView *m_yourAnnotations; + TQDict m_yourFileItems; TQMap m_yourFileNames; TQMap m_yourLines; diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 210ee532..fe1a5230 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -43,7 +43,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) setPalette(pal); setFocusPolicy( TQ_NoFocus ); - m_popupMenu = new KPopupMenu(this); + m_popupMenu = new TDEPopupMenu(this); connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index f2a8d894..f958ac00 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -21,7 +21,7 @@ #include class TDEProcess; -class KPopupMenu; +class TDEPopupMenu; class MessageItem; @@ -85,7 +85,7 @@ protected slots: private: uint m_maxItems; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; }; #endif diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 1ba6e467..5e1757e3 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -27,7 +27,7 @@ #include "domtreeview.moc" -DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name) +DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : TDEListView(parent, name) { setCaption(name); setRootIsDecorated(true); diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index ba282d3b..1621fd61 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -32,10 +32,10 @@ class TQString; class TQGridLayout; /** - * This class is very useful to see the DOM tree in a KListView + * This class is very useful to see the DOM tree in a TDEListView */ -class DOMTreeView : public KListView +class DOMTreeView : public TDEListView { Q_OBJECT diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index dbe6ae53..21d614dc 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -92,7 +92,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse metaItems->setSorting(0, true); - //set the cssRules KListView + //set the cssRules TDEListView //cssRules->setEditable(false); cssRules->addColumn(i18n("Selector")); cssRules->addColumn(i18n("Rule")); diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index 1b2ca3d2..9d35c33b 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -2261,7 +2261,7 @@ void KafkaWidget::applyQueuedToggableTagActions() { if(tag_action->name() == *it) { - tag_action->slotActionActivated(KAction::EmulatedActivation, Qt::NoButton); + tag_action->slotActionActivated(TDEAction::EmulatedActivation, Qt::NoButton); break; } } diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 51b41628..6560191b 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable m_enableViewSource = enableViewSource; if (m_enableViewSource) { - m_contextMenu = new KPopupMenu(parentWidget); + m_contextMenu = new TDEPopupMenu(parentWidget); m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 41212459..73bd23e5 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -22,7 +22,7 @@ #include -class KPopupMenu; +class TDEPopupMenu; /** *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon */ @@ -68,7 +68,7 @@ protected: private: KURL m_previewedURL; - KPopupMenu *m_contextMenu; + TDEPopupMenu *m_contextMenu; TQStrList history; unsigned int hpos; bool m_enableViewSource; diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index b52f02f6..252ac07c 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name) m_name = a_name; if (!m_action) { - m_action = new KToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); + m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); } m_action->setText(a_name); } diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index c7a4c705..5f022797 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -31,7 +31,7 @@ class TQString; *@author Marc Britton */ -class KToggleAction; +class TDEToggleAction; class KMdiToolViewAccessor; class QuantaView; @@ -119,7 +119,7 @@ protected: TQGuardedPtr m_part; bool m_readOnlyPart; QuantaView *m_view; - KToggleAction *m_action; + TDEToggleAction *m_action; private: // Private attributes TQString m_standardName; KMdiToolViewAccessor* m_pluginToolView; diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 51a2cf25..b2ce2713 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -41,9 +41,9 @@ QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { m_parent = parent; - (void) new KAction( i18n( "Configure &Plugins..." ), 0, 0, + (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0, this, TQT_SLOT( slotPluginsEdit() ), - ((KMainWindow*)parent)->actionCollection(), "configure_plugins" ); + ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); } diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 29d23964..d3c84d26 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -29,7 +29,7 @@ #include "eventeditordlg.h" #include "qpevents.h" -EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +EventConfigurationDlg::EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) : EventConfigurationDlgS(parent,name,fl) { m_actionCollection = actionCollection; diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index 9841d009..b7c64779 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -20,7 +20,7 @@ #include "eventconfigurationdlgs.h" class TQDomDocument; -class KActionCollection; +class TDEActionCollection; struct EventAction; typedef TQMap > EventActions; @@ -30,7 +30,7 @@ class EventConfigurationDlg : public EventConfigurationDlgS public: - EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventConfigurationDlg(); void initEvents(EventActions *events); void saveEvents(TQDomDocument dom); @@ -41,7 +41,7 @@ public slots: void slotDeleteEvent(); protected: - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; protected slots: diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 2c9b133f..f60d8f6d 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -71,7 +71,7 @@ - + Event diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index ddd22837..d98c5ce3 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -35,7 +35,7 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) +EventEditorDlg::EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) : EventEditorDlgS(parent,name,fl) { m_actionCollection = actionCollection; @@ -388,7 +388,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) TQStringList items; for (uint i = 0; i < m_actionCollection->count(); i++) { - KAction *a = m_actionCollection->action(i); + TDEAction *a = m_actionCollection->action(i); action = dynamic_cast(a); if (!action || action->type() != "script") { diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 697821c6..45b94a95 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -21,7 +21,7 @@ #include "eventeditordlgs.h" class TQLabel; -class KActionCollection; +class TDEActionCollection; class KComboBox; class EventEditorDlg : public EventEditorDlgS @@ -30,7 +30,7 @@ class EventEditorDlg : public EventEditorDlgS public: - EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EventEditorDlg(); void setEvent(const TQString &name); void setAction(const TQString &name); @@ -48,7 +48,7 @@ protected: TQMap m_scriptActions; TQMap m_otherActions; - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; protected slots: diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index d3786e3b..c4da3a3c 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -68,7 +68,7 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -Project::Project(KMainWindow *parent) +Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); diff --git a/quanta/project/project.h b/quanta/project/project.h index 42d18fef..e1487ad7 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -37,7 +37,7 @@ typedef TQMap > EventActions; */ class TDEConfig; -class KMainWindow; +class TDEMainWindow; struct TeamMember { TQString name; @@ -64,7 +64,7 @@ public: * the parameter is only used at the first call to create the class * */ - static Project* const ref(KMainWindow *parent = 0L) + static Project* const ref(TDEMainWindow *parent = 0L) { static Project *m_ref; if (!m_ref) m_ref = new Project(parent); @@ -212,7 +212,7 @@ private: * If you need the class use Project::ref() for * construction and reference */ - Project(KMainWindow *parent); + Project(TDEMainWindow *parent); ProjectPrivate *d; bool m_projectToolbarVisible; diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 7e676e2b..1df99466 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -80,13 +80,13 @@ ProjectPrivate::~ProjectPrivate() } /** setup of the actions */ -void ProjectPrivate::initActions(KActionCollection *ac) +void ProjectPrivate::initActions(TDEActionCollection *ac) { - (void) new KAction( i18n( "&New Project..." ), "window_new", 0, + (void) new TDEAction( i18n( "&New Project..." ), "window_new", 0, this, TQT_SLOT( slotNewProject() ), ac, "project_new" ); - (void) new KAction( i18n( "&Open Project..." ), "project_open", 0, + (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, this, TQT_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = @@ -97,24 +97,24 @@ void ProjectPrivate::initActions(KActionCollection *ac) m_projectRecent->setToolTip(i18n("Open/Open recent project")); connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); - closeprjAction = new KAction( i18n( "&Close Project" ), "fileclose", 0, + closeprjAction = new TDEAction( i18n( "&Close Project" ), "fileclose", 0, this, TQT_SLOT( slotCloseProject() ), ac, "project_close" ); - openPrjViewAction = new KSelectAction( i18n( "Open Project &View..." ), 0, + openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); - savePrjViewAction = new KAction( i18n( "&Save Project View" ), "filesave", 0, + savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "filesave", 0, this, TQT_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); - saveAsPrjViewAction = new KAction( i18n( "Save Project View &As..." ), "filesaveas", 0, + saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "filesaveas", 0, this, TQT_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); - deletePrjViewAction = new KSelectAction( i18n( "&Delete Project View" ), "editdelete", 0, + deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "editdelete", 0, ac, "project_view_delete" ); connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); @@ -122,33 +122,33 @@ void ProjectPrivate::initActions(KActionCollection *ac) - insertFileAction = new KAction( i18n( "&Insert Files..." ), 0, + insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, this, TQT_SLOT( slotAddFiles() ), ac, "project_insert_file" ); - insertDirAction = new KAction( i18n( "Inser&t Folder..." ), 0, + insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, this, TQT_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); - rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0, + rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, parent, TQT_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); - uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8, + uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "up", Key_F8, parent, TQT_SLOT( slotUpload() ), ac, "project_upload" ); - projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, + projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, parent, TQT_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = - new KAction( i18n( "Save as Project Template..." ), 0, + new TDEAction( i18n( "Save as Project Template..." ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = - new KAction( i18n( "Save Selection to Project Template File..." ), 0, + new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index 0b0a14df..d67d27d3 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -30,12 +30,12 @@ class TQWidgetStack; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TDEConfig; class KDirWatch; -class KRecentFilesAction; -class KSelectAction; +class TDERecentFilesAction; +class TDESelectAction; class KTempFile; class CopyTo; @@ -73,7 +73,7 @@ upload.*/ bool usePreviewPrefix; bool m_persistentBookmarks; TQString author; - KRecentFilesAction *m_projectRecent; + TDERecentFilesAction *m_projectRecent; ProjectNewGeneral *png; ProjectNewLocal *pnl; @@ -91,7 +91,7 @@ upload.*/ TQString m_defaultEncoding; TQRegExp excludeRx; TQStringList excludeList; - KMainWindow *m_mainWindow; + TDEMainWindow *m_mainWindow; TQString m_debuggerClientEdit; TQMap m_passwdList; ProjectList m_projectFiles; ///< the list with the _absolute_ URL's of the project @@ -116,14 +116,14 @@ upload.*/ bool m_showUploadTreeviews; bool m_eventsEnabled; - KAction + TDEAction *closeprjAction, *insertFileAction, *insertDirAction, *uploadProjectAction, *rescanPrjDirAction, *projectOptionAction, *saveAsProjectTemplateAction, *saveSelectionAsProjectTemplateAction, *savePrjViewAction, *saveAsPrjViewAction; - KSelectAction *openPrjViewAction, *deletePrjViewAction; + TDESelectAction *openPrjViewAction, *deletePrjViewAction; /** the filename of the local webprj file after download */ TQString m_tmpProjectFile; TQString m_tmpSessionFile; @@ -133,7 +133,7 @@ upload.*/ EventActions *m_events; /** setup of the actions */ - void initActions(KActionCollection *ac); + void initActions(TDEActionCollection *ac); void adjustActions(); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index aa1c42f6..dc8f0328 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -83,7 +83,7 @@ &Edit... - + Name diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 365a7cae..ac5b3ffa 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -142,11 +142,11 @@ - - + + - + @@ -155,20 +155,20 @@ - - - + + + - + - - + + @@ -178,9 +178,9 @@ - - - + + + @@ -188,38 +188,38 @@ - - + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -227,13 +227,13 @@ - - + + - - - + + + @@ -278,7 +278,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -957,7 +957,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1061,7 +1061,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1086,7 +1086,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1315,7 +1315,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1418,7 +1418,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1436,7 +1436,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1491,7 +1491,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1830,7 +1830,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -2662,7 +2662,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 8b3e34f0..22430940 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -109,7 +109,7 @@ Document::Document(KTextEditor::Document *doc, userTagList.setAutoDelete(true); // remove the unwanted actions - KAction *a = m_view->actionCollection()->action( "file_export" ); + TDEAction *a = m_view->actionCollection()->action( "file_export" ); if (a) m_view->actionCollection()->take(a); a = m_view->actionCollection()->action( "file_save" ); @@ -148,7 +148,7 @@ Document::Document(KTextEditor::Document *doc, if (a) a->setShortcut(TQt::SHIFT + TQt::Key_F11); - KActionMenu *bookmarkAction = dynamic_cast(m_view->actionCollection()->action( "bookmarks" )); + TDEActionMenu *bookmarkAction = dynamic_cast(m_view->actionCollection()->action( "bookmarks" )); if (bookmarkAction) { m_view->actionCollection()->take(bookmarkAction); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 960f600a..9bbd2e1c 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -927,7 +927,7 @@ void QuantaApp::slotNewStatus() if (w->doc()->isReadWrite()) { - KToggleAction *a = dynamic_cast(w->view()->actionCollection()->action("set_insert")); + TDEToggleAction *a = dynamic_cast(w->view()->actionCollection()->action("set_insert")); if (a) { statusBar()->changeItem(a->isChecked() ? i18n(" OVR ") : i18n(" INS "),IDS_INS_OVR); @@ -979,8 +979,8 @@ void QuantaApp::slotOptionsConfigureKeys() { if (KTextEditor::Document *doc = dynamic_cast(part)) { - KActionPtrList actionList = doc->actionCollection()->actions(); - KActionPtrList::Iterator actionIt; + TDEActionPtrList actionList = doc->actionCollection()->actions(); + TDEActionPtrList::Iterator actionIt; if (!w || w->doc() != doc) { for ( actionIt = actionList.begin(); actionIt != actionList.end(); ++actionIt) @@ -1050,7 +1050,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) dlg = new KEditToolbar(factory(), this); KMenuBar *mb = menuBar(); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); //remove the manually added menus BEFORE the dlg shows up if (m_debugger->UI()) { @@ -1094,7 +1094,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action"); for (uint i = 0; i < nodeList.count(); i++) { - KAction *action = ac->action(nodeList.item(i).toElement().attribute("name").ascii()); + TDEAction *action = ac->action(nodeList.item(i).toElement().attribute("name").ascii()); if (action) action->plug(menu); } @@ -1421,15 +1421,15 @@ void QuantaApp::slotShowPreviewWidget(bool show) } } - KToggleAction *ta = 0L; + TDEToggleAction *ta = 0L; int viewLayout = view->currentViewsLayout(); if (viewLayout == QuantaView::SourceOnly) - ta = (KToggleAction *) actionCollection()->action( "show_quanta_editor" ); + ta = (TDEToggleAction *) actionCollection()->action( "show_quanta_editor" ); else if (viewLayout == QuantaView::VPLOnly) - ta = (KToggleAction *) actionCollection()->action( "show_kafka_view" ); + ta = (TDEToggleAction *) actionCollection()->action( "show_kafka_view" ); else if (viewLayout == QuantaView::SourceAndVPL) { - ta = (KToggleAction *) actionCollection()->action( "show_kafka_and_quanta" ); + ta = (TDEToggleAction *) actionCollection()->action( "show_kafka_and_quanta" ); } if (ta) { @@ -1798,7 +1798,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl; - if (toolbarTab->iconText() == KToolBar::IconTextBottom) + if (toolbarTab->iconText() == TDEToolBar::IconTextBottom) { tb->setGeometry(0,0, toolbarTab->width(), tb->iconSize() + TQFontMetrics(TDEGlobalSettings::toolBarFont()).height() + 10); toolbarTab->setFixedHeight(toolbarTab->tabHeight() + tb->height() + 3); @@ -1822,7 +1822,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl return tb; } - return KMainWindow::createContainer( parent, index, element, id ); + return TDEMainWindow::createContainer( parent, index, element, id ); } @@ -1833,7 +1833,7 @@ void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomEle ToolbarTabWidget::ref()->removePage(container); } else - KMainWindow::removeContainer( container, parent, element, id ); + TDEMainWindow::removeContainer( container, parent, element, id ); } void QuantaApp::slotBack() @@ -1959,7 +1959,7 @@ void QuantaApp::slotContextMenuAboutToShow() } } } - KAction *action = actionCollection()->action("open_file_under_cursor"); + TDEAction *action = actionCollection()->action("open_file_under_cursor"); if (action) { if (!name.isEmpty()) @@ -2254,7 +2254,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) { tagAction->setModified(true); tagAction->data().setAttribute("shortcut", oldShortcuts[actionName]); - tagAction->setShortcut(KShortcut(oldShortcuts[actionName])); + tagAction->setShortcut(TDEShortcut(oldShortcuts[actionName])); } } else { @@ -2273,7 +2273,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) //Plug in the actions & build the menu TQPopupMenu *menu = new TQPopupMenu; - KAction *action; + TDEAction *action; nodeList = toolbarGUI->domDocument().elementsByTagName("Action"); for (uint i = 0; i < nodeList.count(); i++) { @@ -2319,8 +2319,8 @@ void QuantaApp::showToolbarFile(const KURL &url) { TQDomNodeList nodeList; TQPopupMenu *menu = new TQPopupMenu; - KAction *action; - KActionCollection *ac = actionCollection(); + TDEAction *action; + TDEActionCollection *ac = actionCollection(); nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action"); for (uint i = 0; i < nodeList.count(); i++) { @@ -2900,7 +2900,7 @@ bool QuantaApp::removeToolbars() return true; } -void QuantaApp::slotDeleteAction(KAction *action) +void QuantaApp::slotDeleteAction(TDEAction *action) { //remove all references to this action TQDomElement el = static_cast(action)->data(); @@ -2934,10 +2934,10 @@ void QuantaApp::slotDeleteAction(KAction *action) void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_actionName) { - KAction *action = 0L; + TDEAction *action = 0L; TQString actionName = a_actionName; actionName.replace('&',"&&"); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); uint actionCount = ac->count(); TQString str; for (uint i = 0; i < actionCount; i++) @@ -3253,7 +3253,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) if (toolbarGUI) { - KAction *action; + TDEAction *action; //Rename the _Separator_ tags back to Separator, so they are not treated //as changes TQDomNodeList nodeList = toolbarGUI->domDocument().elementsByTagName("_Separator_"); @@ -3641,7 +3641,7 @@ void QuantaApp::slotUploadDTEP() void QuantaApp::slotSmartTagInsertion() { - KAction *action = actionCollection()->action("smart_tag_insertion"); + TDEAction *action = actionCollection()->action("smart_tag_insertion"); if(!action) return; if(!ViewManager::ref()->activeDocument() || !ViewManager::ref()->activeView() || @@ -3649,10 +3649,10 @@ void QuantaApp::slotSmartTagInsertion() { KMessageBox::error(this, "Smart Tag Insertion is available only for (X)HTML for the moment."); qConfig.smartTagInsertion = false; - (static_cast(action))->setChecked(false); + (static_cast(action))->setChecked(false); return; } - qConfig.smartTagInsertion = (static_cast(action))->isChecked(); + qConfig.smartTagInsertion = (static_cast(action))->isChecked(); } void QuantaApp::slotDownloadTemplate() @@ -5068,7 +5068,7 @@ void QuantaApp::slotShowVPLOnly() void QuantaApp::initTabWidget(bool closeButtonsOnly) { KTabWidget *tab = tabWidget(); - KAcceleratorManager::setNoAccel(tab); + TDEAcceleratorManager::setNoAccel(tab); if (tab) { if (qConfig.showCloseButtons == "ShowAlways") diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index dd95cdfe..942195de 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -71,12 +71,12 @@ class TQPopupMenu; class WHTMLPart; class TDEHTMLView; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class TDEProcess; -class KSelectAction; -class KRecentFilesAction; -class KToolBarPoupAction; +class TDESelectAction; +class TDERecentFilesAction; +class TDEToolBarPoupAction; class KTextEdit; class TagAction; @@ -93,7 +93,7 @@ class TQDomDocument; class Document; class DebuggerManager; class QuantaInit; -class KToolBarPopupAction; +class TDEToolBarPopupAction; class KTempFile; namespace KTextEditor { @@ -351,7 +351,7 @@ public slots: /** Rename the toolbar. */ void slotRenameToolbar(); /** Delete an action */ - void slotDeleteAction(KAction *action); + void slotDeleteAction(TDEAction *action); /** Remove the action from toolbar*/ void slotRemoveAction(const TQString&, const TQString& actionName); /** Edit the action */ @@ -587,14 +587,14 @@ private: TQTimer *statusbarTimer; // ACTIONS - KRecentFilesAction *projectToolbarFiles; + TDERecentFilesAction *projectToolbarFiles; - KToggleAction *showVPLAction, *showSourceAction, *showVPLSourceAction, *showDTDToolbar; - KToolBarPopupAction *showPreviewAction; + TDEToggleAction *showVPLAction, *showSourceAction, *showVPLSourceAction, *showDTDToolbar; + TDEToolBarPopupAction *showPreviewAction; - KAction *saveAction, *saveAllAction; + TDEAction *saveAction, *saveAllAction; - KAction *editTagAction, *selectTagAreaAction; + TDEAction *editTagAction, *selectTagAreaAction; TQDomDocument* m_actions; @@ -646,7 +646,7 @@ protected: // Protected attributes TQDict m_toolbarList; public: //TODO: check if it's worth to make a read method for them - KRecentFilesAction *fileRecent; + TDERecentFilesAction *fileRecent; /** True when the whole quanta is initialized. */ bool quantaStarted; bool m_loopStarted; //true if an internal event loop has been started diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 08b73763..155a376b 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -248,7 +248,7 @@ void QuantaInit::initQuanta() break; } } - KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu")); + TDEActionMenu *toolviewMenu = (TDEActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu")); if (toolviewMenu) toolviewMenu->plug(m_quanta->windowMenu()); @@ -464,8 +464,8 @@ void QuantaInit::initView() //set the toolview and close button style before the GUI is created m_config->setGroup("General Options"); - int iconTextMode = m_config->readNumEntry("IconTextMode", KToolBar::IconOnly); - toolBarTab->setIconText(KToolBar::IconText(iconTextMode)); + int iconTextMode = m_config->readNumEntry("IconTextMode", TDEToolBar::IconOnly); + toolBarTab->setIconText(TDEToolBar::IconText(iconTextMode)); qConfig.toolviewTabs = m_config->readNumEntry("MDI style", KMdi::IconOnly); m_quanta->initTabWidget(); @@ -586,8 +586,8 @@ void QuantaInit::readOptions() qConfig.docPosition = m_config->readEntry("Documentation area","Tab"); qConfig.smartTagInsertion = m_config->readBoolEntry("Smart Tag Insertion", false); - KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); - (static_cast(action))->setChecked(qConfig.smartTagInsertion); + TDEAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); + (static_cast(action))->setChecked(qConfig.smartTagInsertion); TQSize s(800,580); m_quanta->resize( m_config->readSizeEntry("Geometry", &s)); @@ -705,19 +705,19 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { - KActionCollection *ac = m_quanta->actionCollection(); - new KAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate"); - m_quanta->editTagAction = new KAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, + TDEActionCollection *ac = m_quanta->actionCollection(); + new TDEAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate"); + m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ), TQT_TQOBJECT(ac), "edit_current_tag" ); - m_quanta->selectTagAreaAction = new KAction( i18n( "&Select Current Tag Area" ), 0, + m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ), TQT_TQOBJECT(ac), "select_tag_area" ); - new KAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, + new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ), TQT_TQOBJECT(ac), "expand_abbreviation" ); - new KAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new TDEAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions @@ -729,21 +729,21 @@ void QuantaInit::initActions() KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac); //help - (void) new KAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta), + (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip"); // File actions // KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew() ), ac); KStdAction::open ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs"); + (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs"); m_quanta->fileRecent = KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen())); - (void) new KAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta), + (void) new TDEAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileCloseAll() ), TQT_TQOBJECT(ac), "file_close_all" ); @@ -751,19 +751,19 @@ void QuantaInit::initActions() KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac ); - m_quanta->saveAllAction = new KAction( i18n( "Save All..." ), "save_all", SHIFT+KStdAccel::shortcut(KStdAccel::Save).keyCodeQt(), + m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(), TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ), TQT_TQOBJECT(ac), "file_save_all" ); - (void) new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta), + (void) new TDEAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload"); -// (void) new KAction(i18n("Reload All "), 0, 0, m_quanta, +// (void) new TDEAction(i18n("Reload All "), 0, 0, m_quanta, // TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all"); - (void) new KAction( i18n( "Save as Local Template..." ), 0, + (void) new TDEAction( i18n( "Save as Local Template..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ), TQT_TQOBJECT(ac), "save_local_template" ); - (void) new KAction( i18n( "Save Selection to Local Template File..." ), 0, + (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), TQT_TQOBJECT(ac), "save_selection_local_template" ); @@ -771,68 +771,68 @@ void QuantaInit::initActions() // Edit actions - (void) new KAction( i18n( "Find in Files..." ), + (void) new TDEAction( i18n( "Find in Files..." ), SmallIcon("filefind"), CTRL+ALT+Key_F, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ), TQT_TQOBJECT(ac), "find_in_files" ); - KAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); + TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); aux->setEnabled(false); ac->insert(aux); // Tool actions - (void) new KAction( i18n( "&Context Help..." ), CTRL+Key_H, + (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ), TQT_TQOBJECT(ac), "context_help" ); - (void) new KAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, + (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), TQT_TQOBJECT(ac), "tag_attributes" ); - (void) new KAction( i18n( "&Change the DTD..." ), 0, + (void) new TDEAction( i18n( "&Change the DTD..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ), TQT_TQOBJECT(ac), "change_dtd" ); - (void) new KAction( i18n( "&Edit DTD Settings..." ), 0, + (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ), TQT_TQOBJECT(ac), "edit_dtd" ); - (void) new KAction( i18n( "&Load && Convert DTD..." ), 0, + (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0, DTDs::ref(), TQT_SLOT( slotLoadDTD() ), TQT_TQOBJECT(ac), "load_dtd" ); - (void) new KAction( i18n( "Load DTD E&ntities..." ), 0, + (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0, DTDs::ref(), TQT_SLOT( slotLoadEntities() ), TQT_TQOBJECT(ac), "load_entities" ); - (void) new KAction( i18n( "Load DTD &Package (DTEP)..." ), 0, + (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ), TQT_TQOBJECT(ac), "load_dtep" ); - (void) new KAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0, + (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ), TQT_TQOBJECT(ac), "send_dtep" ); - (void) new KAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, + (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ), TQT_TQOBJECT(ac), "download_dtep" ); - (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, + (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), TQT_TQOBJECT(ac), "upload_dtep" ); /* - (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, + (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), TQT_TQOBJECT(ac), "send_dtep" ); */ - (void) new KAction( i18n( "&Document Properties" ), 0, + (void) new TDEAction( i18n( "&Document Properties" ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ), TQT_TQOBJECT(ac), "tools_document_properties" ); - (void) new KAction ( i18n ("F&ormat XML Code"), 0, + (void) new TDEAction ( i18n ("F&ormat XML Code"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ), TQT_TQOBJECT(ac), "tools_code_formatting"); - (void) new KAction( i18n( "&Convert Tag && Attribute Case..."), 0, + (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()), TQT_TQOBJECT(ac), "tools_change_case"); @@ -840,23 +840,23 @@ void QuantaInit::initActions() m_quanta->showSourceAction = - new KToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, + new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()), TQT_TQOBJECT(ac), "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = - new KToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, + new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ), TQT_TQOBJECT(ac), "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = - new KToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, + new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ), TQT_TQOBJECT(ac), "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); - /**kafkaSelectAction = new KSelectAction(i18n("Main &View"), 0, ac,"show_kafka"); + /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka"); TQStringList list2; list2.append(i18n("&Source Editor")); list2.append(i18n("&VPL Editor (experimental)")); @@ -865,23 +865,23 @@ void QuantaInit::initActions() connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/ - (void) new KAction( i18n( "&Reload Preview" ), "reload", - KStdAccel::shortcut(KStdAccel::Reload).keyCodeQt(), + (void) new TDEAction( i18n( "&Reload Preview" ), "reload", + TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()), TQT_TQOBJECT(ac), "reload" ); - (void) new KAction( i18n( "&Previous File" ), "1leftarrow", KStdAccel::back(), + (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(), TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), TQT_TQOBJECT(ac), "previous_file" ); - (void) new KAction( i18n( "&Next File" ), "1rightarrow", KStdAccel::forward(), + (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(), TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), TQT_TQOBJECT(ac), "next_file" ); // Options actions // - (void) new KAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, + (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ), TQT_TQOBJECT(ac), "configure_actions" ); @@ -889,46 +889,46 @@ void QuantaInit::initActions() KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options"); - new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options"); + new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options"); // Toolbars actions - m_quanta->projectToolbarFiles = new KRecentFilesAction(i18n("Load &Project Toolbar"),0, + m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)), TQT_TQOBJECT(ac), "toolbars_load_project"); - new KAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global"); - new KAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user"); - new KAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local"); - new KAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project"); - new KAction(i18n("&New User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add"); - new KAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove"); - new KAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename"); - new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send"); - new KAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" ); - new KAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" ); - - KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion"); + new TDEAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global"); + new TDEAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user"); + new TDEAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local"); + new TDEAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project"); + new TDEAction(i18n("&New User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add"); + new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove"); + new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename"); + new TDEAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send"); + new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" ); + new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" ); + + TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion"); connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion())); - m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar"); + m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar"); connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); - new KAction(i18n("Complete Text"), CTRL+Key_Space, + new TDEAction(i18n("Complete Text"), CTRL+Key_Space, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion"); - new KAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, + new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back"); KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward"); - new KAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor"); - new KAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file"); - new KAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file"); + new TDEAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor"); + new TDEAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file"); + new TDEAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new KAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */ +/* new TDEAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */ TQString error; int el, ec; @@ -988,16 +988,16 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = - new KToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, + new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ), TQT_TQOBJECT(ac), "show_preview" ); - KAction *act = new KAction( i18n( "Preview Without Frames" ), "", 0, + TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()), TQT_TQOBJECT(ac), "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); - act = new KAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, + act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ), TQT_TQOBJECT(ac), "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1019,51 +1019,51 @@ void QuantaInit::initActions() if (act) act->plug(m_quanta->showPreviewAction->popupMenu()); - act = new KAction( i18n( "View with L&ynx" ), "terminal", 0, + act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ), TQT_TQOBJECT(ac), "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); - (void) new KAction( i18n( "Table Editor..." ), "quick_table", 0, + (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ), TQT_TQOBJECT(ac), "tag_edit_table" ); - (void) new KAction( i18n( "Quick List..." ), "quick_list", 0, + (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ), TQT_TQOBJECT(ac), "tag_quick_list" ); - (void) new KAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, + (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ), TQT_TQOBJECT(ac), "tag_color" ); - (void) new KAction( i18n( "Email..." ), "tag_mail", 0, + (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ), TQT_TQOBJECT(ac), "tag_mail" ); - (void) new KAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, + (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ), TQT_TQOBJECT(ac), "tag_misc" ); - (void) new KAction( i18n( "Frame Wizard..." ), "frame", 0, + (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ), TQT_TQOBJECT(ac), "tag_frame_wizard" ); - (void) new KAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0, + (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ), TQT_TQOBJECT(ac), "edit_paste_html_quoted" ); - (void) new KAction( i18n( "Paste &URL Encoded" ), "editpaste", 0, + (void) new TDEAction( i18n( "Paste &URL Encoded" ), "editpaste", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ), TQT_TQOBJECT(ac), "edit_paste_url_encoded" ); - (void) new KAction( i18n( "Insert CSS..." ),"css", 0, + (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ), TQT_TQOBJECT(ac), "insert_css" ); // special-character combo - KAction* char_action = new KAction( + TDEAction* char_action = new TDEAction( i18n( "Insert Special Character" ), "charset", 0, TQT_TQOBJECT(ac), "insert_char" ); connect( char_action, TQT_SIGNAL(activated()), diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index eb463cf6..61a6db43 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -80,7 +80,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name { fileWatcher = new KDirWatch(this); - attribMenu = new KPopupMenu(); + attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); } @@ -165,7 +165,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, if (readOnly) { //might work only with Kate part - KAction *writeLockAction = w->view()->actionCollection()->action("tools_toggle_write_lock"); + TDEAction *writeLockAction = w->view()->actionCollection()->action("tools_toggle_write_lock"); if (writeLockAction) writeLockAction->activate(); } @@ -365,7 +365,7 @@ void QuantaDoc::slotInsertAttrib( int id ) } delete attribMenu; - attribMenu = new KPopupMenu(); + attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); } diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index 276c3a8c..f2bb84d8 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -53,7 +53,7 @@ signals: void eventHappened(const TQString&, const TQString&, const TQString& ); private: - KPopupMenu *attribMenu; + TDEPopupMenu *attribMenu; bool m_eventLoopStarted; }; diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 5e939222..d214bab6 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -356,7 +356,7 @@ void QuantaView::slotSetSourceLayout() if(m_currentViewsLayout == SourceAndVPL) m_splitterSizes = m_splitter->sizes(); - KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); + TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta) ta->setChecked(true); @@ -391,12 +391,12 @@ void QuantaView::slotSetSourceAndVPLLayout() if (m_currentViewsLayout == SourceAndVPL || !m_document) return; - KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" ); + TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" ); if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); - KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); + TDEToggleAction *ta2 = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); return; @@ -440,12 +440,12 @@ void QuantaView::slotSetVPLOnlyLayout() if(m_currentViewsLayout == SourceAndVPL) m_splitterSizes = m_splitter->sizes(); - KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" ); + TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" ); if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); - KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); + TDEToggleAction *ta2 = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); return; @@ -502,7 +502,7 @@ void QuantaView::slotVPLGetFocus(bool focus) kdDebug(25001)<< "slotVPLGetFocus(" << focus << ")" << endl; #endif int contentsX, contentsY; - KAction *action; + TDEAction *action; if(focus) { @@ -570,7 +570,7 @@ void QuantaView::slotSourceGetFocus() #ifdef LIGHT_DEBUG kdDebug(25001)<< "slotSourceGetFocus(true)" << endl; #endif - KAction *action; + TDEAction *action; quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view()); //We reload the quanta view from the Node Tree. @@ -1027,11 +1027,11 @@ void QuantaView::activated() //TEMP : If the activated document is not a (X)HTML document, disable smartTagInsertion //Will be removed when VPL will support every DTD - KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); + TDEAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); if(action && m_document->defaultDTD()->name.contains("HTML", false) == 0) { qConfig.smartTagInsertion = false; - (static_cast(action))->setChecked(false); + (static_cast(action))->setChecked(false); } reloadLayout(); diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 7cf9a1ed..ae22d25e 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -66,7 +66,7 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveView = 0L; m_lastActiveEditorView = 0L; m_documentationView = 0L; - m_tabPopup = new KPopupMenu(quantaApp); + m_tabPopup = new TDEPopupMenu(quantaApp); m_tabPopup->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); @@ -74,11 +74,11 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_tabPopup->insertItem(SmallIcon("up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); m_tabPopup->insertItem(SmallIcon("editdelete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); - m_fileListPopup = new KPopupMenu(quantaApp); + m_fileListPopup = new TDEPopupMenu(quantaApp); connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int))); m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true); - m_bookmarksMenu = new KPopupMenu(quantaApp); + m_bookmarksMenu = new TDEPopupMenu(quantaApp); m_bookmarks->setBookmarksMenu(m_bookmarksMenu); connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu); diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h index 3e755534..1fc3d642 100644 --- a/quanta/src/viewmanager.h +++ b/quanta/src/viewmanager.h @@ -22,7 +22,7 @@ class Document; class QuantaView; class QuantaBookmarks; class KafkaDocument; -class KPopupMenu; +class TDEPopupMenu; class KMdiChildView; @@ -131,9 +131,9 @@ private: QuantaView *m_lastActiveView; ///< Holds the last active view. Used to deactivate it when a new view is selected QuantaView *m_lastActiveEditorView; ///< Contains the last active view which has an editor inside QuantaView *m_documentationView; ///< Contains the view which holds the documentation browser - KPopupMenu *m_tabPopup; ///< the menu which pops up when the user clicks on a view tab - KPopupMenu *m_fileListPopup; ///< a menu containing the opened views as menu items - KPopupMenu *m_bookmarksMenu; + TDEPopupMenu *m_tabPopup; ///< the menu which pops up when the user clicks on a view tab + TDEPopupMenu *m_fileListPopup; ///< a menu containing the opened views as menu items + TDEPopupMenu *m_bookmarksMenu; QuantaBookmarks *m_bookmarks; QuantaView *m_contextView; ///removeItem(m_openWithMenuId); for (uint i = 0; i < m_openWithActions.count(); i++) { - KAction *action = m_openWithActions[i]; + TDEAction *action = m_openWithActions[i]; delete action; } m_openWithActions.clear(); @@ -599,13 +599,13 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position) if (offers.count() > 0 || plugins.count() > 0) { - m_openWithMenu = new KPopupMenu(this); + m_openWithMenu = new TDEPopupMenu(this); if (offers.count() > 0) { TDETrader::OfferList::Iterator it; for (it = offers.begin(); it != offers.end(); ++it) { - KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); + TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication())); action->plug(m_openWithMenu); m_openWithActions.append(action); @@ -1059,7 +1059,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) void BaseTreeView::saveLayout(TDEConfig *config, const TQString &group) { - KListView::saveLayout(config, group); + TDEListView::saveLayout(config, group); if (! m_saveOpenFolder || ! qConfig.saveTrees) return; @@ -1085,7 +1085,7 @@ void BaseTreeView::saveLayout(TDEConfig *config, const TQString &group) void BaseTreeView::restoreLayout(TDEConfig *config, const TQString &group) { - KListView::restoreLayout(config, group); + TDEListView::restoreLayout(config, group); TDEConfigGroupSaver saver(config, group); setShowToolTips( config->readBoolEntry("ShowToolTips", true) ); diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index bef646ae..f189c4d7 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -37,9 +37,9 @@ class TQPoint; class TQRegExp; class TQCloseEvent; -class KAction; +class TDEAction; class KFileItem; -class KPopupMenu; +class TDEPopupMenu; class KPropertiesDialog; class KURL; class FileInfoDlg; @@ -321,7 +321,7 @@ protected: @param menu the menu where the Open With submenu should be inserted @param position the position in this menu */ - void insertOpenWithMenu(KPopupMenu *menu, int position); + void insertOpenWithMenu(TDEPopupMenu *menu, int position); KPropertiesDialog *propDlg; TQString m_projectName; KURL m_projectBaseURL; @@ -355,9 +355,9 @@ signals: private: bool m_saveOpenFolder; - KPopupMenu *m_openWithMenu; + TDEPopupMenu *m_openWithMenu; int m_openWithMenuId; - TQValueList m_openWithActions; + TQValueList m_openWithActions; TQMap m_pluginIds; }; diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 3d028451..358fec8a 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -29,7 +29,7 @@ #include "docitem.h" DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath) - : KListViewItem(parent) + : TDEListViewItem(parent) { name = _name; topLevel = false; @@ -60,7 +60,7 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *c } DocFolder::DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath) - : KListViewItem(parent) + : TDEListViewItem(parent) { name = _name; topLevel = false; diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index 5f36a825..c6d02fe0 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -31,7 +31,7 @@ Doc tree class TDEConfig; -class DocFolder : public KListViewItem { +class DocFolder : public TDEListViewItem { public: DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath); DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath); diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp index 3fb4ac2f..0e31c2ed 100644 --- a/quanta/treeviews/docitem.cpp +++ b/quanta/treeviews/docitem.cpp @@ -22,14 +22,14 @@ #include "docitem.h" DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url) - : KListViewItem(parent) + : TDEListViewItem(parent) { url = _url; name = _name; } DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url) - : KListViewItem(parent) + : TDEListViewItem(parent) { url = _url; name = _name; diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 6022650b..5a245828 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -28,7 +28,7 @@ class TDEConfig; *@author Yacovlev Alexander & Dmitry Poplavsky */ -class DocItem : public KListViewItem { +class DocItem : public TDEListViewItem { public: DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url); diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 684072a5..a9859858 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -36,7 +36,7 @@ #include "docitem.h" DocTreeView::DocTreeView(TQWidget *parent, const char *name ) - : KListView(parent,name) + : TDEListView(parent,name) { contextHelpDict = new TQDict( 101, false ); @@ -51,7 +51,7 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) addColumn(""); setFullWidth(true); - projectDocFolder = new KListViewItem(this, i18n("Project Documentation")); + projectDocFolder = new TDEListViewItem(this, i18n("Project Documentation")); projectDocFolder->setOpen(true); slotRefreshTree(); setFocusPolicy(TQ_ClickFocus); @@ -60,11 +60,11 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); - m_contextMenu = new KPopupMenu(this); + m_contextMenu = new TDEPopupMenu(this); m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs())); m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc())); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } @@ -161,7 +161,7 @@ void DocTreeView::slotAddProjectDoc(const KURL& url) new DocItem(projectDocFolder, path, url.url()); } -void DocTreeView::slotMenu(KListView *, TQListViewItem *item, const TQPoint &point) +void DocTreeView::slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point) { m_contextMenu->setItemVisible(m_menuReload, false); if (item) diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index 7ce1b656..3168899c 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -26,14 +26,14 @@ #include class DocFolder; -class KPopupMenu; +class TDEPopupMenu; /** *@author Yacovlev Alexander & Dmitry Poplavsky */ -class DocTreeView : public KListView { +class DocTreeView : public TDEListView { Q_OBJECT public: @@ -57,15 +57,15 @@ signals: private slots: void clickItem( TQListViewItem *); void slotDoubleClicked(TQListViewItem *); - void slotMenu(KListView *, TQListViewItem *item, const TQPoint &point); + void slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point); private: TQDict *contextHelpDict; TQValueList m_folderList; - KListViewItem *projectDocFolder; - KPopupMenu *m_contextMenu; + TDEListViewItem *projectDocFolder; + TDEPopupMenu *m_contextMenu; int m_menuReload; }; diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index eee9e6fb..7d82961f 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -82,7 +82,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na topURLList.append(url); } - m_fileMenu = new KPopupMenu(this); + m_fileMenu = new TDEPopupMenu(this); m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); @@ -95,11 +95,11 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - KPopupMenu *createNewMenu = new KPopupMenu(this); + TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); - m_folderMenu = new KPopupMenu(); + m_folderMenu = new TDEPopupMenu(); m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); @@ -116,7 +116,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); - m_emptyMenu = new KPopupMenu(); + m_emptyMenu = new TDEPopupMenu(); m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0); @@ -125,8 +125,8 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na connect(this, TQT_SIGNAL(open(TQListViewItem *)), this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // generate top list of directories for (uint i = 0; i < topURLList.count(); i++) @@ -175,7 +175,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url) /** RMB pressed, bring up the menu */ -void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQPoint &point) +void FilesTreeView::slotMenu(TDEListView* listView, TQListViewItem *item, const TQPoint &point) { Q_UNUSED(listView); #ifdef ENABLE_CVSSERVICE diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index 4cf89304..1cee782b 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -27,7 +27,7 @@ //foward declarations class TQListViewItem; class TQPoint; -class KPopupMenu; +class TDEPopupMenu; class KURL; @@ -48,7 +48,7 @@ protected slots: */ void slotNewTopFolder(); - virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); + virtual void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point); /** creates a new branch from the current url */ @@ -61,9 +61,9 @@ protected slots: protected: virtual KFileTreeBranch* newBranch(const KURL& url); - KPopupMenu *m_fileMenu; - KPopupMenu *m_folderMenu; - KPopupMenu *m_emptyMenu; + TDEPopupMenu *m_fileMenu; + TDEPopupMenu *m_folderMenu; + TDEPopupMenu *m_emptyMenu; int m_menuClose; ///< remembers the menu entry int m_menuPasteFolder; ///< remembers the menu entry int m_insertFileInProject; diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 205e5bf0..fa3a0ed8 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -103,7 +103,7 @@ KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *pare ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) : BaseTreeView(parent,name), m_projectFiles(0) { - //setSelectionModeExt(KListView::Extended); + //setSelectionModeExt(TDEListView::Extended); setRootIsDecorated(false); addColumn(i18n("Project Files"), -1); addColumn(i18n("Description"), -1); @@ -117,13 +117,13 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) newBranch(m_projectBaseURL); // create an empty project branch m_projectDir->root()->setEnabled(false); - m_uploadStatusMenu = new KPopupMenu(this); + m_uploadStatusMenu = new TDEPopupMenu(this); m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload())); m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload())); m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload())); connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow())); - m_fileMenu = new KPopupMenu(this); + m_fileMenu = new TDEPopupMenu(this); m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this, TQT_SLOT(slotOpen())); m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); @@ -139,11 +139,11 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - KPopupMenu *createNewMenu = new KPopupMenu(this); + TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); - m_folderMenu = new KPopupMenu(this); + m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); @@ -158,7 +158,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_projectMenu = new KPopupMenu(this); + m_projectMenu = new TDEPopupMenu(this); m_projectMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(SmallIcon("up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); @@ -169,8 +169,8 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(this, TQT_SIGNAL(open(TQListViewItem *)), this, TQT_SLOT(slotSelectFile(TQListViewItem *))); @@ -222,7 +222,7 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url) /** slot for context menu */ -void ProjectTreeView::slotMenu(KListView *listView, TQListViewItem *item, const TQPoint& point) +void ProjectTreeView::slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint& point) { Q_UNUSED(listView); KURL url = currentURL(); diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index ea67610a..d8c65cbd 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -91,7 +91,7 @@ public slots: // Public slots protected slots: - void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); + void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point); void slotRenameItem(TQListViewItem* kvtvi, const TQString & newText, int col); virtual void slotCreateFolder(); virtual void slotCreateFile(); @@ -119,13 +119,13 @@ private: ProjectTreeView(TQWidget *parent, const char *name); ProjectTreeBranch *m_projectDir; - KPopupMenu *m_fileMenu; - KPopupMenu *m_folderMenu; - KPopupMenu *m_projectMenu; + TDEPopupMenu *m_fileMenu; + TDEPopupMenu *m_folderMenu; + TDEPopupMenu *m_projectMenu; KURL m_documentRootURL; ProjectTreeViewItem *m_documentRootItem; KURL::List m_documentFolderList; - KPopupMenu *m_uploadStatusMenu; + TDEPopupMenu *m_uploadStatusMenu; ProjectList *m_projectFiles; int m_menuClose; ///< remembers the menu entry diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 6819e1ca..768b7416 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -83,7 +83,7 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_globalDir->excludeFilterRx.setPattern(excludeString); m_localDir->excludeFilterRx.setPattern(excludeString); - m_fileMenu = new KPopupMenu(this); + m_fileMenu = new TDEPopupMenu(this); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Description"), this, TQT_SLOT(slotProperties())); m_fileMenu->insertItem(SmallIcon("run"), i18n("&Run Script"), this, TQT_SLOT(slotRun())); m_fileMenu->insertSeparator(); @@ -95,12 +95,12 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail())); m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript())); - m_folderMenu = new KPopupMenu(this); + m_folderMenu = new TDEPopupMenu(this); m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript())); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); restoreLayout( kapp->config(), className() ); // the restored size of the first column might be too large for the current content @@ -112,7 +112,7 @@ ScriptTreeView::~ScriptTreeView() { } -void ScriptTreeView::slotMenu(KListView *, TQListViewItem *item, const TQPoint &point) +void ScriptTreeView::slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point) { if (!item) { diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index 9914c622..88f0e4cb 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -54,14 +54,14 @@ protected slots: * displays the RBM * * - * @param listView KListView where the event comes from + * @param listView TDEListView where the event comes from * * @param item TQListViewItem where the mousepointer is hovering * * @param point TQPoint coordinates of the event * */ - virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); + virtual void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point); /** * slot of TQListView @@ -212,8 +212,8 @@ private: /** * remember the menu for manipulation */ - KPopupMenu *m_fileMenu; - KPopupMenu *m_folderMenu; + TDEPopupMenu *m_fileMenu; + TDEPopupMenu *m_folderMenu; int m_downloadMenuId; }; diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index fa34f582..bfb6ad23 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -98,7 +98,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & // I must read this here because quanta_init has not done it yet qConfig.showHiddenFiles = m_config->readBoolEntry("Show Hidden Files", true); - m_fileMenu = new KPopupMenu(); + m_fileMenu = new TDEPopupMenu(); m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); @@ -111,7 +111,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_folderMenu = new KPopupMenu(); + m_folderMenu = new TDEPopupMenu(); // m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); @@ -127,8 +127,8 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & connect(this, TQT_SIGNAL(open(TQListViewItem *)), this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); @@ -156,7 +156,7 @@ KFileTreeBranch* ServerTreeView::newBranch(const KURL& url) /** RMB pressed, bring up the menu */ -void ServerTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQPoint &point) +void ServerTreeView::slotMenu(TDEListView* listView, TQListViewItem *item, const TQPoint &point) { Q_UNUSED(listView); if (item) diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index fc3b8c96..94ab33fe 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -24,7 +24,7 @@ //foward declarations class TQListViewItem; class TQPoint; -class KPopupMenu; +class TDEPopupMenu; class KURL; class ProjectList; @@ -67,7 +67,7 @@ public: protected slots: - void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); + void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point); /** repaints the treeview items, because they might be added to or removed from the project*/ void slotReloadTree( ProjectList *fileList, bool buildNewTree, const TQStringList &folderToOpen); @@ -75,8 +75,8 @@ protected slots: protected: KFileTreeBranch* newBranch(const KURL& url); - KPopupMenu *m_fileMenu; - KPopupMenu *m_folderMenu; + TDEPopupMenu *m_fileMenu; + TDEPopupMenu *m_folderMenu; int m_menuClose; ///< remembers the menu entry int m_menuPasteFolder; ///< remembers the menu entry int m_insertFileInProject; diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index 0325645e..f54cb23c 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -32,7 +32,7 @@ #include "resource.h" StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title) - : KListViewItem(parent, a_title) + : TDEListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; @@ -42,7 +42,7 @@ StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title) StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title, TQListViewItem *after ) -: KListViewItem(parent, after, a_title) +: TDEListViewItem(parent, after, a_title) { parentTree = parent->parentTree; hasOpenFileMenu = false; @@ -202,7 +202,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString } StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title ) -: KListViewItem(parent, a_title) +: TDEListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index 2f408707..b7ba1585 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -27,7 +27,7 @@ class StructTreeView; *@author Yacovlev Alexander & Dmitry Poplavsky & Andras Mantia */ -class StructTreeTag : public KListViewItem { +class StructTreeTag : public TDEListViewItem { public: StructTreeTag(TQListView *parent, const TQString a_title = TQString() ); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 4fa7afa9..ccf3caef 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -58,7 +58,7 @@ extern GroupElementMapList globalGroupMap; StructTreeView::StructTreeView(TQWidget *parent, const char *name ) - : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ + : TDEListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ { for (int i = 0; i < 15; i++) groupOpened.append(false); @@ -85,7 +85,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) setFocusPolicy(TQ_ClickFocus); - dtdMenu = new KPopupMenu(this); + dtdMenu = new TDEPopupMenu(this); dtdMenu->insertItem(i18n("All Present DTEP")); dtdMenu->insertSeparator(); @@ -100,11 +100,11 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - emptyAreaMenu = new KPopupMenu(this); + emptyAreaMenu = new TDEPopupMenu(this); emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu); emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQT_SLOT(slotReparseMenuItem())); - popupMenu = new KPopupMenu(this); + popupMenu = new TDEPopupMenu(this); popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu); popupMenu -> insertSeparator(); @@ -828,7 +828,7 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV if(!TQTextDrag::canDecode(e)) return; - KPopupMenu *menu = new KPopupMenu( this ); + TDEPopupMenu *menu = new TDEPopupMenu( this ); menu->insertItem( i18n("&Move Here"), DRAG_MOVE, 0 ); menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 ); menu->insertSeparator(); @@ -872,7 +872,7 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) m_draggedItem = itemAt(p); m_marker = m_draggedItem; } - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after) diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index d0e32dfc..d6158431 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -27,7 +27,7 @@ *@author Andras Mantia & Paulo Moura Guedes & Yacovlev Alexander & Dmitry Poplavsky */ -class KPopupMenu; +class TDEPopupMenu; class TDEConfig; class KURL; class TQTime; @@ -38,7 +38,7 @@ class Parser; class Document; struct DTDStruct; -class StructTreeView : public KListView { +class StructTreeView : public TDEListView { Q_OBJECT public: @@ -130,9 +130,9 @@ private: int followCursorId; bool followCursorFlag; - KPopupMenu *popupMenu; - KPopupMenu *emptyAreaMenu; - KPopupMenu *dtdMenu; + TDEPopupMenu *popupMenu; + TDEPopupMenu *emptyAreaMenu; + TDEPopupMenu *dtdMenu; StructTreeTag *lastTag; TDEConfig *config; TQStringList dtdList; diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 776ac366..4a21ec27 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -40,13 +40,13 @@ #include "qextfileinfo.h" #include "styleeditor.h" -TopLevelItem::TopLevelItem(KListView* parent, const TQString &title) -: KListViewItem(parent, title) +TopLevelItem::TopLevelItem(TDEListView* parent, const TQString &title) +: TDEListViewItem(parent, title) { } -TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title) -: KListViewItem(parent, after, title) +TopLevelItem::TopLevelItem(TDEListView* parent, TQListViewItem* after, const TQString &title) +: TDEListViewItem(parent, after, title) { } @@ -68,7 +68,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, f.setBold(true); p->setFont(f); } - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); if (column == 0) { p->setPen(TQPen(TQColor(0,0,0))); @@ -77,7 +77,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, } ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) -: KListViewItem(parent) +: TDEListViewItem(parent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); @@ -106,7 +106,7 @@ void ParentItem::paintCell(TQPainter *p, const TQColorGroup &cg, if ( !p ) return; - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); if (column == 0) { p->setPen(TQPen(TQColor(0,0,0))); @@ -144,14 +144,14 @@ void ParentItem::showList(bool show) //Generic attribute item AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2) -: KListViewItem(parent, title, title2) +: TDEListViewItem(parent, title, title2) { lin = 0L; lin2 = 0L; } AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: KListViewItem(parent, title, title2) +: TDEListViewItem(parent, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -162,7 +162,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con } AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2) -: KListViewItem(listView, title, title2) +: TDEListViewItem(listView, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -176,7 +176,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2, TQListViewItem* after) -: KListViewItem(listView, after, title, title2) +: TDEListViewItem(listView, after, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -199,7 +199,7 @@ void AttributeItem::paintCell(TQPainter *p, const TQColorGroup &cg, { if ( !p ) return; - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); if (column == 0) { p->setPen(TQPen(TQColor(0,0,0))); diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h index 81f5cb43..9b06f7dd 100644 --- a/quanta/treeviews/tagattributeitems.h +++ b/quanta/treeviews/tagattributeitems.h @@ -19,8 +19,8 @@ class KColorCombo; class KURLRequester; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class TQListViewItem; class TQLineEdit; class TQComboBox; @@ -31,12 +31,12 @@ class TagAttributeTree; class Node; class StyleEditor; -class TopLevelItem : public KListViewItem +class TopLevelItem : public TDEListViewItem { public: - TopLevelItem(KListView *parent, const TQString& title); - TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title); + TopLevelItem(TDEListView *parent, const TQString& title); + TopLevelItem(TDEListView *parent, TQListViewItem* after, const TQString& title); virtual ~TopLevelItem(); @@ -46,7 +46,7 @@ protected: int column, int width, int align ); }; -class ParentItem : public KListViewItem +class ParentItem : public TDEListViewItem { public: @@ -68,7 +68,7 @@ private: TagAttributeTree *m_listView; }; -class AttributeItem : public KListViewItem +class AttributeItem : public TDEListViewItem { public: AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index abf4fb37..a125405e 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -51,7 +51,7 @@ #include "viewmanager.h" EditableTree::EditableTree(TQWidget *parent, const char *name) -: KListView(parent, name) +: TDEListView(parent, name) { m_editable = true; } @@ -69,7 +69,7 @@ void EditableTree::setCurrentItem( TQListViewItem *item) if ( dynamic_cast(it) ) static_cast(it)->hideEditor(); - KListView::setCurrentItem(item); + TDEListView::setCurrentItem(item); it = currentItem(); if ( dynamic_cast(it) ) static_cast(it)->showEditor(); @@ -120,7 +120,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event) AttributeItem *it = dynamic_cast(currentItem()); AttributeItem *up = 0L, *down = 0L; if(!it) - return KListView::eventFilter(object, event); + return TDEListView::eventFilter(object, event); if(currentItem()->itemAbove()) up = dynamic_cast(currentItem()->itemAbove()); if(currentItem()->itemBelow()) @@ -168,12 +168,12 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event) break; } } - return KListView::eventFilter(object, event);; + return TDEListView::eventFilter(object, event);; } void DualEditableTree::resizeEvent(TQResizeEvent *ev) { - KListView::resizeEvent(ev); + TDEListView::resizeEvent(ev); if(!currentItem()) return; AttributeItem *item = dynamic_cast(currentItem()); if(item) @@ -194,7 +194,7 @@ void DualEditableTree::setCurrentItem(TQListViewItem *item) static_cast(it)->hideEditor(1); } - KListView::setCurrentItem(item); + TDEListView::setCurrentItem(item); it = currentItem(); if ( dynamic_cast(it) ) static_cast(it)->showEditor(curCol); @@ -411,7 +411,7 @@ void TagAttributeTree::editorContentChanged() if ( dynamic_cast(it) ) static_cast(it)->hideEditor(); - KListView::setCurrentItem(item); + TDEListView::setCurrentItem(item); it = currentItem(); if ( dynamic_cast(it) ) static_cast(it)->showEditor(); diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index d91135da..c3e7decf 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -23,7 +23,7 @@ //app includes -class KListView; +class TDEListView; class TQListViewItem; class ParentItem; class Node; @@ -31,7 +31,7 @@ class TQLabel; class KPushButton; class TQGridLayout; -class EditableTree : public KListView { +class EditableTree : public TDEListView { Q_OBJECT diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index a9aa75d0..f6bbce38 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -129,7 +129,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa -TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) +TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent) { typeToi18n["text/all"] = i18n("Text Snippet"); @@ -141,7 +141,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) i18nToType[i18n("Document Template")] = "template/all"; i18nToType[i18n("Site Template")] = "site/all"; - m_fileMenu = new KPopupMenu(this); + m_fileMenu = new TDEPopupMenu(this); m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); @@ -155,7 +155,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) m_fileMenu->insertSeparator(); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_folderMenu = new KPopupMenu(this); + m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); m_folderMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); @@ -170,7 +170,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); - m_emptyAreaMenu = new KPopupMenu(this); + m_emptyAreaMenu = new TDEPopupMenu(this); m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); addColumn(i18n("Templates"), -1); @@ -182,8 +182,8 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) localURL.setPath(locateLocal("data", resourceDir + "templates/")); newBranch(localURL); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(this, TQT_SIGNAL(open(TQListViewItem *)), this, TQT_SLOT(slotSelectFile(TQListViewItem *))); @@ -251,7 +251,7 @@ void TemplatesTreeView::slotInsertInDocument() } -void TemplatesTreeView::slotMenu(KListView*, TQListViewItem *item, const TQPoint &point) +void TemplatesTreeView::slotMenu(TDEListView*, TQListViewItem *item, const TQPoint &point) { if (!item) { @@ -641,7 +641,7 @@ void TemplatesTreeView::slotProperties() uint j = 1; m_quantaProperties->actionCombo->insertItem(i18n(NONE)); TQString tmpStr; - KActionCollection *ac = m_mainWindow->actionCollection(); + TDEActionCollection *ac = m_mainWindow->actionCollection(); uint acCount = ac->count(); for (uint i = 0; i < acCount; i++) { @@ -900,7 +900,7 @@ KURL TemplatesTreeView::filterTemplate() config.setGroup("Filtering"); name = config.readEntry("Action", NONE); TagAction *filterAction = 0L; - KActionCollection *ac = m_mainWindow->actionCollection(); + TDEActionCollection *ac = m_mainWindow->actionCollection(); uint acCount = ac->count(); TQString tmpStr; for (uint i = 0; i < acCount; i++) diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index 075c9ba7..22fd3535 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -22,7 +22,7 @@ //forward declarations class QuantaPropertiesPage; -class KMainWindow; +class TDEMainWindow; class TemplatesTreeBranch : public BaseTreeBranch { @@ -49,7 +49,7 @@ public: * the parameter are only used at the first call to create the class * */ - static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L) + static TemplatesTreeView* const ref(TDEMainWindow *parent = 0L, const char *name = 0L) { static TemplatesTreeView *m_ref; if (!m_ref) m_ref = new TemplatesTreeView (parent, name); @@ -74,14 +74,14 @@ public slots: * displays the RBM * * - * @param listView KListView where the event comes from + * @param listView TDEListView where the event comes from * * @param item TQListViewItem where the mousepointer is hovering * * @param point TQPoint coordinates of the event * */ - void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); + void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point); /** Creates a new document based in the selected template. */ void slotNewDocument(); /** Insert the template as text, image, new document. */ @@ -119,7 +119,7 @@ private: * If you need the class use TemplatesTreeView::ref() for * construction and reference */ - TemplatesTreeView(KMainWindow *parent, const char *name = 0L); + TemplatesTreeView(TDEMainWindow *parent, const char *name = 0L); /** Filters the template through and action, and returns the modified/filtered template file */ KURL filterTemplate(); @@ -135,10 +135,10 @@ private: TQString m_projectName; KURL localURL; KURL globalURL; - KPopupMenu *m_fileMenu; - KPopupMenu *m_folderMenu; - KPopupMenu *m_emptyAreaMenu; - KMainWindow *m_mainWindow; + TDEPopupMenu *m_fileMenu; + TDEPopupMenu *m_folderMenu; + TDEPopupMenu *m_emptyAreaMenu; + TDEMainWindow *m_mainWindow; DirInfo m_dirInfo; DirInfo m_parentDirInfo; int m_insertFileInProject; diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index 5257117e..25ae4e98 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -28,7 +28,7 @@ #include "resource.h" UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : TDEListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; @@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con } UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : TDEListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index 736a3a88..aaa31b21 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -26,7 +26,7 @@ class KFileItem; -class UploadTreeFile : public KListViewItem { +class UploadTreeFile : public TDEListViewItem { public: UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem); UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem); diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp index 123eaf35..ea933592 100644 --- a/quanta/treeviews/uploadtreefolder.cpp +++ b/quanta/treeviews/uploadtreefolder.cpp @@ -28,7 +28,7 @@ #include "resource.h" UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name ) - : KListViewItem( parent, name, "", "", "" ) + : TDEListViewItem( parent, name, "", "", "" ) { parentFolder = parent; m_url = a_url; @@ -41,7 +41,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, } UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name ) - : KListViewItem( parent, name, "", "", "" ) + : TDEListViewItem( parent, name, "", "", "" ) { parentFolder = 0L; m_url = a_url; diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index d6959ab3..96b45771 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -30,7 +30,7 @@ class KURL; -class UploadTreeFolder : public KListViewItem { +class UploadTreeFolder : public TDEListViewItem { public: UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name); UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name ); diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 4c5af524..f45681ad 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -24,7 +24,7 @@ #include "quantacommon.h" UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : - KListView(parent, name) + TDEListView(parent, name) { setRootIsDecorated( true ); setSorting( 0 ); diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index 8d9edfbb..f8a58e80 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -29,7 +29,7 @@ class KFileItem; *@author George Vilches & Andras Mantia */ -class UploadTreeView : public KListView { +class UploadTreeView : public TDEListView { Q_OBJECT public: 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(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 #include -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 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 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::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(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(TQT_TQWIDGET(childrenList->at(i))); + TDEToolBarButton *w = static_cast(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 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 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; }; -- cgit v1.2.3