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/src/quanta.cpp | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'quanta/src/quanta.cpp') 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") -- cgit v1.2.3