From f78eb03afb8c9a380985d26286afc40b4c89b292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:15:35 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/core.cpp | 4 +-- src/core.h | 4 +-- src/editorproxy.cpp | 6 ++-- src/mainwindowshare.cpp | 22 +++++++------- src/mainwindowshare.h | 18 +++++------ src/newui/button.cpp | 4 +-- src/newui/button.h | 6 ++-- src/newui/ddockwindow.cpp | 8 ++--- src/newui/ddockwindow.h | 8 ++--- src/partcontroller.cpp | 44 +++++++++++++-------------- src/partcontroller.h | 18 +++++------ src/profileengine/editor/profileeditor.cpp | 44 +++++++++++++-------------- src/profileengine/editor/profileeditor.h | 8 ++--- src/profileengine/editor/profileeditorbase.ui | 14 ++++----- src/profileengine/lib/profileengine.h | 10 +++--- src/projectmanager.cpp | 12 ++++---- src/projectmanager.h | 12 ++++---- src/settingswidget.ui | 2 +- src/simplemainwindow.cpp | 30 +++++++++--------- src/simplemainwindow.h | 26 ++++++++-------- 20 files changed, 150 insertions(+), 150 deletions(-) (limited to 'src') diff --git a/src/core.cpp b/src/core.cpp index 7d937d16..0fc882f9 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -38,9 +38,9 @@ void Core::setupShourtcutTips(KXMLGUIClient * client) clients = TopLevel::getInstance()->main()->guiFactory()->clients(); for( TQPtrListIterator it(clients); it.current(); ++it ) { - KActionCollection *actionCollection = (*it)->actionCollection(); + TDEActionCollection *actionCollection = (*it)->actionCollection(); for (int i = 0; i < actionCollection->count(); i++) { - KAction *action = actionCollection->action(i); + TDEAction *action = actionCollection->action(i); TQString tooltip = action->toolTip(); if (tooltip.isEmpty()) diff --git a/src/core.h b/src/core.h index b30549ca..c041eac0 100644 --- a/src/core.h +++ b/src/core.h @@ -27,14 +27,14 @@ public: static Core *getInstance(); /** - * Setup shourtcut tips. For every KAction with a shortcut, + * Setup shourtcut tips. For every TDEAction with a shortcut, * appends the shortcut string, in parenthesis, to the * actions's tooltip. If tooltip already has any text in * parens, it's removed and shortcut is added instead. * * @param client * Pointer to KXMLGUIClient object, which contain an collection - * of actions (KActionCollection). If the parameter is null, + * of actions (TDEActionCollection). If the parameter is null, * function is applied to the all available KXMLGUIClient objects. */ static void setupShourtcutTips(KXMLGUIClient * client = 0); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index c9d34e29..a7b7a995 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -45,9 +45,9 @@ EditorProxy::EditorProxy() m_delayedViewCreationCompatibleUI = true; - KAction *ac = new KAction( i18n("Show Context Menu"), 0, this, + TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); - KShortcut cut ;/*= KStdAccel::shortcut(KStdAccel::PopupMenuContext);*/ + TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); } @@ -123,7 +123,7 @@ void EditorProxy::installPopup( KParts::Part * part ) return; } - KAction * action = NULL; + TDEAction * action = NULL; //If there is a tab for this file, we don't need to plug the closing menu entries here TDEConfig *config = TDEGlobal::config(); config->setGroup("UI"); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 1b9f492f..a81d7b39 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -107,9 +107,9 @@ void MainWindowShare::createActions() KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); - KAction* action; + TDEAction* action; - m_stopProcesses = new KToolBarPopupAction( i18n( "&Stop" ), "stop", + m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); @@ -157,25 +157,25 @@ void MainWindowShare::createActions() m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("Show statusbar

Hides or shows the statusbar.")); - action = new KAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("Next window

Switches to the next window.")); - action = new KAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("Previous window

Switches to the previous window.")); - action = new KAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("Last accessed window

Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new KAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("First accessed window

Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new KAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new KAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("Configure editor

Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); @@ -357,21 +357,21 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) m_configureEditorAction->setEnabled( true ); // remove the part's merged menu entry - KAction * action = part->action("set_confdlg"); // name from katepartui.rc + TDEAction * action = part->action("set_confdlg"); // name from katepartui.rc if ( action ) { kdDebug(9000) << " *** found \"set_confdlg\" action - unplugging" << endl; action->unplugAll(); } - if ( KAction * action = part->action("file_save") ) + if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); } - if ( KAction * action = part->action("file_reload") ) + if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h index f178b014..c10b9b0e 100644 --- a/src/mainwindowshare.h +++ b/src/mainwindowshare.h @@ -19,8 +19,8 @@ #include -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; namespace KParts { class MainWindow; } @@ -72,15 +72,15 @@ private slots: void contextMenu(TQPopupMenu *, const Context *); private: - KToggleAction* m_toggleMainToolbar; - KToggleAction* m_toggleBuildToolbar; - KToggleAction* m_toggleViewToolbar; - KToggleAction* m_toggleBrowserToolbar; - KToggleAction* m_toggleStatusbar; + TDEToggleAction* m_toggleMainToolbar; + TDEToggleAction* m_toggleBuildToolbar; + TDEToggleAction* m_toggleViewToolbar; + TDEToggleAction* m_toggleBrowserToolbar; + TDEToggleAction* m_toggleStatusbar; - KAction * m_configureEditorAction; + TDEAction * m_configureEditorAction; - KToolBarPopupAction* m_stopProcesses; //!< Stops all running processes + TDEToolBarPopupAction* m_stopProcesses; //!< Stops all running processes KParts::MainWindow* m_pMainWnd; TQPtrList activeProcesses; diff --git a/src/newui/button.cpp b/src/newui/button.cpp index fc6720f9..3ccefc94 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -55,9 +55,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); - m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0, + m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); - m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0, + m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); TDEConfig *config = kapp->config(); diff --git a/src/newui/button.h b/src/newui/button.h index 82dc6ee9..4d816788 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -25,7 +25,7 @@ #include "comdefs.h" -class KAction; +class TDEAction; namespace Ideal { @@ -98,8 +98,8 @@ private: TQString m_realText; TQIconSet m_realIconSet; - KAction *m_assignAccelAction; - KAction *m_clearAccelAction; + TDEAction *m_assignAccelAction; + TDEAction *m_clearAccelAction; friend class ButtonBar; }; diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 091ad1c0..2b046b14 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); setVisible(m_visible); @@ -320,7 +320,7 @@ void DDockWindow::showWidget(TQWidget *widget) void DDockWindow::setMovingEnabled(bool) { - //some operations on KMainWindow cause moving to be enabled + //some operations on TDEMainWindow cause moving to be enabled //but we always don't want DDockWindow instances to be movable TQDockWindow::setMovingEnabled(false); } diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h index fb6b0976..10727f22 100644 --- a/src/newui/ddockwindow.h +++ b/src/newui/ddockwindow.h @@ -29,7 +29,7 @@ class TQWidgetStack; class TQPopupMenu; class KComboBox; -class KAction; +class TDEAction; class DMainWindow; @@ -107,9 +107,9 @@ private: TQBoxLayout *m_internalLayout; - KAction * m_moveToDockLeft; - KAction * m_moveToDockRight; - KAction * m_moveToDockBottom; + TDEAction * m_moveToDockLeft; + TDEAction * m_moveToDockRight; + TDEAction * m_moveToDockBottom; }; #endif diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 083aeb2f..db615763 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -124,9 +124,9 @@ PartController *PartController::getInstance() void PartController::setupActions() { - KActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); + TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - KAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("Open file

Opens an existing file without adding it to the project.

") ); @@ -134,12 +134,12 @@ void PartController::setupActions() m_openRecentAction->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); - m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("Save all

Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new KAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("Revert all

Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); @@ -149,33 +149,33 @@ void PartController::setupActions() m_closeWindowAction->setWhatsThis(TQString("%1

%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("Close all

Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new KAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("Close all others

Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); - new KActionSeparator(ac, "dummy_separator"); + new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("Back

Moves backwards one step in the navigation history.")); connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("Forward

Moves forward one step in the navigation history.")); connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new KAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("Goto Last Edit Position

Open the last edited file and position cursor at the point of edit") ); @@ -752,26 +752,26 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( KTextEditor::View * view = dynamic_cast( doc->widget() ) ) { - KActionCollection* c = view->actionCollection(); + TDEActionCollection* c = view->actionCollection(); // Be extra carefull, in case the part either don't provide those // action, or uses different shortcuts. - if (KAction* a = c->action("view_folding_markers")) + if (TDEAction* a = c->action("view_folding_markers")) { - if (a->shortcut() == KShortcut(Key_F9)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F9)) + a->setShortcut(TDEShortcut()); } - if (KAction* a = c->action("view_dynamic_word_wrap")) + if (TDEAction* a = c->action("view_dynamic_word_wrap")) { - if (a->shortcut() == KShortcut(Key_F10)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F10)) + a->setShortcut(TDEShortcut()); } - if (KAction* a = c->action("view_line_numbers")) + if (TDEAction* a = c->action("view_line_numbers")) { - if (a->shortcut() == KShortcut(Key_F11)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F11)) + a->setShortcut(TDEShortcut()); } } @@ -1619,7 +1619,7 @@ void PartController::slotForward() void PartController::slotBackAboutToShow() { - KPopupMenu *popup = m_backAction->popupMenu(); + TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); if ( m_backHistory.isEmpty()) return; @@ -1636,7 +1636,7 @@ void PartController::slotBackAboutToShow() void PartController::slotForwardAboutToShow( ) { - KPopupMenu * popup = m_forwardAction->popupMenu(); + TDEPopupMenu * popup = m_forwardAction->popupMenu(); popup->clear(); if ( m_forwardHistory.isEmpty() ) return; diff --git a/src/partcontroller.h b/src/partcontroller.h index edec5afc..2e621c38 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -30,9 +30,9 @@ namespace Kate { class Document; } class TQTabWidget; class TQPopupMenu; -class KAction; -class KToolBarPopupAction; -class KRecentFilesAction; +class TDEAction; +class TDEToolBarPopupAction; +class TDERecentFilesAction; class HTMLDocumentationPart; class HistoryEntry; class KDirWatch; @@ -178,14 +178,14 @@ private: static PartController *s_instance; - KAction *m_closeWindowAction, *m_saveAllFilesAction, *m_revertAllFilesAction; - KAction *m_closeAllWindowsAction, *m_closeOtherWindowsAction; - KRecentFilesAction *m_openRecentAction; + TDEAction *m_closeWindowAction, *m_saveAllFilesAction, *m_revertAllFilesAction; + TDEAction *m_closeAllWindowsAction, *m_closeOtherWindowsAction; + TDERecentFilesAction *m_openRecentAction; TQString m_presetEncoding; - KToolBarPopupAction* m_backAction; - KToolBarPopupAction* m_forwardAction; - KAction * m_gotoLastEditPosAction; + TDEToolBarPopupAction* m_backAction; + TDEToolBarPopupAction* m_forwardAction; + TDEAction * m_gotoLastEditPosAction; bool m_openNextAsText; diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 7732ea90..c10aca8c 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -38,17 +38,17 @@ #include "addprofilewidget.h" -class ProfileItem: public KListViewItem { +class ProfileItem: public TDEListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListView *parent, Profile *profile) + :TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListViewItem *parent, Profile *profile) + : TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); @@ -60,10 +60,10 @@ private: Profile *m_profile; }; -class EDListItem: public KListViewItem{ +class EDListItem: public TDEListViewItem{ public: - EDListItem(KListView *parent, const TQString &text, bool derived) - : KListViewItem(parent, text), m_derived(derived) + EDListItem(TDEListView *parent, const TQString &text, bool derived) + : TDEListViewItem(parent, text), m_derived(derived) { } @@ -74,7 +74,7 @@ public: TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, TDEGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, alignment); + TDEListViewItem::paintCell(p, cgNew, column, width, alignment); } private: @@ -134,22 +134,22 @@ void ProfileEditor::refreshAvailableList() { //filling a list of available plugins allList->clear(); - allCore = new KListViewItem(allList, i18n("Core")); + allCore = new TDEListViewItem(allList, i18n("Core")); allCore->setOpen(true); - allGlobal = new KListViewItem(allList, i18n("Global")); + allGlobal = new TDEListViewItem(allList, i18n("Global")); allGlobal->setOpen(true); - allProject = new KListViewItem(allList, i18n("Project")); + allProject = new TDEListViewItem(allList, i18n("Project")); allProject->setOpen(true); TDETrader::OfferList olist = engine.allOffers(ProfileEngine::Core); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allCore, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allCore, (*it)->desktopEntryName(), (*it)->genericName()); olist = engine.allOffers(ProfileEngine::Global); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allGlobal, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allGlobal, (*it)->desktopEntryName(), (*it)->genericName()); olist = engine.allOffers(ProfileEngine::Project); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allProject, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allProject, (*it)->desktopEntryName(), (*it)->genericName()); } void ProfileEditor::profileExecuted(TQListViewItem *item) @@ -198,29 +198,29 @@ void ProfileEditor::fillPluginsList(Profile *profile) { pluginsView->clear(); - KListViewItem *core = new KListViewItem(pluginsView, i18n("Core Plugins")); + TDEListViewItem *core = new TDEListViewItem(pluginsView, i18n("Core Plugins")); core->setOpen(true); - KListViewItem *global = new KListViewItem(pluginsView, i18n("Global Plugins")); + TDEListViewItem *global = new TDEListViewItem(pluginsView, i18n("Global Plugins")); global->setOpen(true); - KListViewItem *project = new KListViewItem(pluginsView, i18n("Project Plugins")); + TDEListViewItem *project = new TDEListViewItem(pluginsView, i18n("Project Plugins")); project->setOpen(true); TDETrader::OfferList coreOffers = engine.offers(profile->name(), ProfileEngine::Core); for (TDETrader::OfferList::const_iterator it = coreOffers.constBegin(); it != coreOffers.constEnd(); ++it) - new KListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); TDETrader::OfferList globalOffers = engine.offers(profile->name(), ProfileEngine::Global); for (TDETrader::OfferList::const_iterator it = globalOffers.constBegin(); it != globalOffers.constEnd(); ++it) - new KListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); TDETrader::OfferList projectOffers = engine.offers(profile->name(), ProfileEngine::Project); for (TDETrader::OfferList::const_iterator it = projectOffers.constBegin(); it != projectOffers.constEnd(); ++it) - new KListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); } @@ -245,7 +245,7 @@ void ProfileEditor::addProfile() prof->genericNameEdit->text(), prof->descriptionEdit->text()); profilesList->currentItem()->setOpen(true); - new ProfileItem(static_cast(profilesList->currentItem()), profile); + new ProfileItem(static_cast(profilesList->currentItem()), profile); } } diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h index ad5610f0..7c54ea71 100644 --- a/src/profileengine/editor/profileeditor.h +++ b/src/profileengine/editor/profileeditor.h @@ -25,7 +25,7 @@ class TQListBoxItem; class TQListViewItem; -class KListViewItem; +class TDEListViewItem; class ProfileEditor : public ProfileEditorBase { Q_OBJECT @@ -62,9 +62,9 @@ protected: private: ProfileEngine engine; - KListViewItem *allCore; - KListViewItem *allGlobal; - KListViewItem *allProject; + TDEListViewItem *allCore; + TDEListViewItem *allGlobal; + TDEListViewItem *allProject; }; #endif diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 4c6af611..fc6b99f2 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -80,7 +80,7 @@ - + Name @@ -212,7 +212,7 @@ Derived properties: - + derivedPropertiesBox @@ -241,7 +241,7 @@ Own properties: - + ownPropertiesBox @@ -283,7 +283,7 @@ Enabled: - + Plugin Name @@ -323,7 +323,7 @@ Disabled: - + Plugin Name @@ -430,7 +430,7 @@ Available plugins: - + Name @@ -510,7 +510,7 @@ unnamed - + Name diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index 4ea93bdf..0cf66d7d 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -206,17 +206,17 @@ public: } }; - class ProfileItem: public KListViewItem { + class ProfileItem: public TDEListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListView *parent, Profile *profile) + :TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListViewItem *parent, Profile *profile) + : TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 96e258e9..dbaa49c5 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -89,18 +89,18 @@ ProjectManager *ProjectManager::getInstance() return s_instance; } -void ProjectManager::createActions( KActionCollection* ac ) +void ProjectManager::createActions( TDEActionCollection* ac ) { - KAction *action; + TDEAction *action; - action = new KAction(i18n("&Open Project..."), "project_open", 0, + action = new TDEAction(i18n("&Open Project..."), "project_open", 0, this, TQT_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("Open project

Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = - new KRecentFilesAction(i18n("Open &Recent Project"), 0, + new TDERecentFilesAction(i18n("Open &Recent Project"), 0, this, TQT_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); @@ -108,14 +108,14 @@ void ProjectManager::createActions( KActionCollection* ac ) m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); m_closeProjectAction = - new KAction(i18n("C&lose Project"), "fileclose",0, + new TDEAction(i18n("C&lose Project"), "fileclose",0, this, TQT_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("Close project

Closes the current project.")); - m_projectOptionsAction = new KAction(i18n("Project &Options"), "configure", 0, + m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, this, TQT_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); diff --git a/src/projectmanager.h b/src/projectmanager.h index 5d932d99..3a92409e 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -11,12 +11,12 @@ #include #include -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class KService; class ProjectInfo; class ProjectSession; -class KRecentFilesAction; +class TDERecentFilesAction; class KDevPlugin; @@ -59,7 +59,7 @@ public: KURL projectFile() const; TQString projectName() const; - void createActions( KActionCollection* ac ); + void createActions( TDEActionCollection* ac ); ProjectSession* projectSession() const; @@ -95,8 +95,8 @@ private: ProjectInfo *m_info; - KAction *m_closeProjectAction, *m_projectOptionsAction; - KRecentFilesAction *m_openRecentProjectAction; + TDEAction *m_closeProjectAction, *m_projectOptionsAction; + TDERecentFilesAction *m_openRecentProjectAction; static ProjectManager *s_instance; diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 0fe85778..5d139860 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -215,7 +215,7 @@ - + outputFont diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index d51bc31e..edb61145 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -393,7 +393,7 @@ void SimpleMainWindow::setCurrentDocumentCaption( const TQString &caption ) } } -KMainWindow *SimpleMainWindow::main() +TDEMainWindow *SimpleMainWindow::main() { return this; } @@ -408,48 +408,48 @@ void SimpleMainWindow::createFramework() void SimpleMainWindow::createActions() { - m_raiseEditor = new KAction(i18n("Raise &Editor"), ALT+Key_C, + m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("Raise editor

Focuses the editor.")); - m_lowerAllDocks = new KAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, + m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new KAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); - m_splitHor = new KAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, + m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); - m_splitVer = new KAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, + m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); - m_splitHor1 = new KAction(i18n("Split &Horizontal"), 0, + m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); - m_splitVer1 = new KAction(i18n("Split &Vertical"), 0, + m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); - m_splitHor2 = new KAction(i18n("Split &Horizontal and Open"), 0, + m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); - m_splitVer2 = new KAction(i18n("Split &Vertical and Open"), 0, + m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); - m_raiseLeftDock = new KAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, + m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); - m_raiseRightDock = new KAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, + m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); - m_raiseBottomDock = new KAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, + m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), @@ -591,7 +591,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) if (!tabWidget) return; - KPopupMenu tabMenu; + TDEPopupMenu tabMenu; tabMenu.insertTitle(tabWidget->tabLabel(w)); //Find the document on whose tab the user clicked @@ -693,7 +693,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast(TQT_TQWIDGET(main()->child("window", "KPopupMenu"))); + m_windowMenu = static_cast(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu"))); if (!m_windowMenu) { diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index b72cb9e1..a060a0af 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -25,7 +25,7 @@ #include #include -class KAction; +class TDEAction; class TQPopupMenu; class MainWindowShare; class Context; @@ -55,7 +55,7 @@ public: virtual void saveSettings(); virtual void setCurrentDocumentCaption( const TQString &caption ); - virtual KMainWindow *main(); + virtual TDEMainWindow *main(); void init(); @@ -119,17 +119,17 @@ private: MainWindowShare *m_mainWindowShare; KURL m_currentTabURL; - KAction *m_raiseEditor; - KAction *m_lowerAllDocks; - KAction *m_splitHor; - KAction *m_splitVer; - KAction *m_splitHor1; - KAction *m_splitVer1; - KAction *m_splitHor2; - KAction *m_splitVer2; - KAction *m_raiseBottomDock; - KAction *m_raiseLeftDock; - KAction *m_raiseRightDock; + TDEAction *m_raiseEditor; + TDEAction *m_lowerAllDocks; + TDEAction *m_splitHor; + TDEAction *m_splitVer; + TDEAction *m_splitHor1; + TDEAction *m_splitVer1; + TDEAction *m_splitHor2; + TDEAction *m_splitVer2; + TDEAction *m_raiseBottomDock; + TDEAction *m_raiseLeftDock; + TDEAction *m_raiseRightDock; TQPopupMenu *m_windowMenu; TQValueList > m_windowList; -- cgit v1.2.1