From 23494e0357462739913cc0b74afebe6672dac9c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:06:24 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- yakuake/src/first_run_dialog.cpp | 10 ++-- yakuake/src/first_run_dialog.h | 8 +-- yakuake/src/main_window.cpp | 100 +++++++++++++++---------------- yakuake/src/main_window.h | 30 +++++----- yakuake/src/skin_list_item.cpp | 4 +- yakuake/src/skin_list_item.h | 4 +- yakuake/src/skin_settings.cpp | 4 +- yakuake/src/skin_settings_ui.ui | 2 +- yakuake/src/tab_bar.cpp | 2 +- yakuake/src/tab_bar.h | 2 +- yakuake/src/tabbed_widget.cpp | 24 ++++---- yakuake/src/tabbed_widget.h | 4 +- yakuake/src/title_bar.cpp | 2 +- yakuake/src/title_bar.h | 2 +- 14 files changed, 99 insertions(+), 99 deletions(-) diff --git a/yakuake/src/first_run_dialog.cpp b/yakuake/src/first_run_dialog.cpp index 62baf17..a0609a5 100644 --- a/yakuake/src/first_run_dialog.cpp +++ b/yakuake/src/first_run_dialog.cpp @@ -21,25 +21,25 @@ FirstRunDialog::FirstRunDialog(TQWidget* parent, const char* name) : FirstRunDialogUI(parent, name) { - connect(key_button, TQT_SIGNAL(capturedShortcut(const KShortcut&)), - this, TQT_SLOT(validateShortcut(const KShortcut&))); + connect(key_button, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQT_SLOT(validateShortcut(const TDEShortcut&))); } FirstRunDialog::~FirstRunDialog() { } -KShortcut FirstRunDialog::shortcut() +TDEShortcut FirstRunDialog::shortcut() { return key_button->shortcut(); } -void FirstRunDialog::setShortcut(const KShortcut& shortcut) +void FirstRunDialog::setShortcut(const TDEShortcut& shortcut) { key_button->setShortcut(shortcut, false); } -void FirstRunDialog::validateShortcut(const KShortcut& shortcut) +void FirstRunDialog::validateShortcut(const TDEShortcut& shortcut) { if (!KKeyChooser::checkGlobalShortcutsConflict(shortcut, true, this) && !KKeyChooser::KKeyChooser::checkStandardShortcutsConflict(shortcut, true, this)) diff --git a/yakuake/src/first_run_dialog.h b/yakuake/src/first_run_dialog.h index 84fe2d8..e924027 100644 --- a/yakuake/src/first_run_dialog.h +++ b/yakuake/src/first_run_dialog.h @@ -17,7 +17,7 @@ #include "first_run_dialog_ui.h" -class KShortcut; +class TDEShortcut; class FirstRunDialog : public FirstRunDialogUI { @@ -28,15 +28,15 @@ class FirstRunDialog : public FirstRunDialogUI explicit FirstRunDialog(TQWidget* parent, const char* name=NULL); ~FirstRunDialog(); - KShortcut shortcut(); + TDEShortcut shortcut(); public slots: - void setShortcut(const KShortcut& shortcut); + void setShortcut(const TDEShortcut& shortcut); private slots: - void validateShortcut(const KShortcut& shortcut); + void validateShortcut(const TDEShortcut& shortcut); }; diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp index 5682efc..288f560 100644 --- a/yakuake/src/main_window.cpp +++ b/yakuake/src/main_window.cpp @@ -32,7 +32,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : DCOPObject("DCOPInterface"), - KMainWindow(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder), + TDEMainWindow(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder), step(0) { first_run_dialog = 0; @@ -77,65 +77,65 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : // Initialize shortcuts. - KAction* action; + TDEAction* action; - KShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); - shortcut.append(KShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); - action = new KAction(i18n("New Session"), SmallIcon("tab_new"), shortcut, + TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); + shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); + action = new TDEAction(i18n("New Session"), SmallIcon("tab_new"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()), actionCollection(), "add_tab"); - action = new KAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"), + action = new TDEAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()), actionCollection(), "add_tab_twohorizontal"); - action = new KAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"), + action = new TDEAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()), actionCollection(), "add_tab_twovertical"); - action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), + action = new TDEAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()), actionCollection(), "add_tab_quad"); - action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"), + action = new TDEAction(i18n("Go to Next Terminal"), SmallIcon("next"), "Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()), actionCollection(), "focus_next_terminal"); - action = new KAction(i18n("Go to Previous Terminal"), SmallIcon("previous"), + action = new TDEAction(i18n("Go to Previous Terminal"), SmallIcon("previous"), "Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()), actionCollection(), "focus_previous_terminal"); - action = new KAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert, + action = new TDEAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection(), "paste_clipboard"); - action = new KAction(i18n("Paste Selection"), SmallIcon("editpaste"), + action = new TDEAction(i18n("Paste Selection"), SmallIcon("editpaste"), CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), actionCollection(), "paste_selection"); - action = new KAction(i18n("Rename Session..."), SmallIcon("edit"), + action = new TDEAction(i18n("Rename Session..."), SmallIcon("edit"), "Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()), actionCollection(), "edit_name"); - action = new KAction(i18n("Increase Width"), SmallIcon("viewmag+"), + action = new TDEAction(i18n("Increase Width"), SmallIcon("viewmag+"), "Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()), actionCollection(), "increasew"); - action = new KAction(i18n("Decrease Width"), SmallIcon("viewmag-"), + action = new TDEAction(i18n("Decrease Width"), SmallIcon("viewmag-"), "Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()), actionCollection(), "decreasew"); - action = new KAction(i18n("Increase Height"), SmallIcon("viewmag+"), + action = new TDEAction(i18n("Increase Height"), SmallIcon("viewmag+"), "Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()), actionCollection(), "increaseh"); - action = new KAction(i18n("Decrease Height"), SmallIcon("viewmag-"), + action = new TDEAction(i18n("Decrease Height"), SmallIcon("viewmag-"), "Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()), actionCollection(), "decreaseh"); - action = new KAction(i18n("Configure Global Shortcuts..."), + action = new TDEAction(i18n("Configure Global Shortcuts..."), SmallIcon("configure_shortcuts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()), actionCollection(), "global_shortcuts"); - action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this), + action = new TDEAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit"); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection()); @@ -152,47 +152,47 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : createTitleBar(); createTabsBar(); - action = new KAction(i18n("Go to Next Session"), SmallIcon("next"), + action = new TDEAction(i18n("Go to Next Session"), SmallIcon("next"), "Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()), actionCollection(), "next_tab"); - action = new KAction(i18n("Go to Previous Session"), SmallIcon("previous"), + action = new TDEAction(i18n("Go to Previous Session"), SmallIcon("previous"), "Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()), actionCollection(), "previous_tab"); - action = new KAction(i18n("Move Session Left"), SmallIcon("back"), + action = new TDEAction(i18n("Move Session Left"), SmallIcon("back"), "Ctrl+Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemLeft()), actionCollection(), "move_tab_left"); - action = new KAction(i18n("Move Session Right"), SmallIcon("forward"), + action = new TDEAction(i18n("Move Session Right"), SmallIcon("forward"), "Ctrl+Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemRight()), actionCollection(), "move_tab_right"); - remove_tab_action = new KAction(i18n("Close Session"), SmallIcon("fileclose"), 0, + remove_tab_action = new TDEAction(i18n("Close Session"), SmallIcon("fileclose"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab"); - connect(remove_tab_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), - TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState))); + connect(remove_tab_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState))); - split_horiz_action = new KAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"), + split_horiz_action = new TDEAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"), CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally"); - connect(split_horiz_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), - TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState))); + connect(split_horiz_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState))); - split_vert_action = new KAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"), + split_vert_action = new TDEAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"), CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically"); - connect(split_vert_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), - TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState))); + connect(split_vert_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState))); - remove_term_action = new KAction(i18n("Close Terminal"), SmallIcon("view_remove"), + remove_term_action = new TDEAction(i18n("Close Terminal"), SmallIcon("view_remove"), CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), 0, actionCollection(), "remove_terminal"); - connect(remove_term_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), - TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState))); + connect(remove_term_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState))); TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this)); connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int))); for (uint i = 1; i <= 12; ++i) { - KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").arg(i), 0, 0, + TDEAction* tab_selection_action = new TDEAction(i18n("Switch to Session %1").arg(i), 0, 0, tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit()); tab_selection_mapper->setMapping(tab_selection_action, i-1); } @@ -377,9 +377,9 @@ void MainWindow::slotRemoveSession(int session_id) sessions_stack[session_id]->deleteLater(); } -void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, TQt::ButtonState /* state */) +void MainWindow::slotHandleRemoveSession(TDEAction::ActivationReason reason, TQt::ButtonState /* state */) { - if (reason == KAction::PopupMenuActivation + if (reason == TDEAction::PopupMenuActivation && tab_bar->pressedPosition() != -1) { slotRemoveSession(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); @@ -650,9 +650,9 @@ void MainWindow::windowActivationChange(bool old_active) slotToggleState(); } -void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */) +void MainWindow::slotHandleHorizontalSplit(TDEAction::ActivationReason reason, TQt::ButtonState /* state */) { - if (reason == KAction::PopupMenuActivation + if (reason == TDEAction::PopupMenuActivation && tab_bar->pressedPosition() != -1) { slotSplitHorizontally(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); @@ -662,9 +662,9 @@ void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt slotSplitHorizontally(); } -void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */) +void MainWindow::slotHandleVerticalSplit(TDEAction::ActivationReason reason, TQt::ButtonState /* state */) { - if (reason == KAction::PopupMenuActivation + if (reason == TDEAction::PopupMenuActivation && tab_bar->pressedPosition() != -1) { slotSplitVertically(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); @@ -675,9 +675,9 @@ void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt:: } -void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, TQt::ButtonState /* state */) +void MainWindow::slotHandleRemoveTerminal(TDEAction::ActivationReason reason, TQt::ButtonState /* state */) { - if (reason == KAction::PopupMenuActivation + if (reason == TDEAction::PopupMenuActivation && tab_bar->pressedPosition() != -1) { slotRemoveTerminal(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); @@ -765,7 +765,7 @@ void MainWindow::createMenu() { /* Creates the main menu. */ - menu = new KPopupMenu(); + menu = new TDEPopupMenu(); menu->insertTitle(i18n("Help")); @@ -777,7 +777,7 @@ void MainWindow::createMenu() actionCollection()->action(KStdAction::stdName(KStdAction::FullScreen))->plug(menu); - screen_menu = new KPopupMenu(menu); + screen_menu = new TDEPopupMenu(menu); if (TQApplication::desktop()->numScreens() > 1) { @@ -785,11 +785,11 @@ void MainWindow::createMenu() connect(screen_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetScreen(int))); } - width_menu = new KPopupMenu(menu); + width_menu = new TDEPopupMenu(menu); menu->insertItem(i18n("Width"), width_menu); connect(width_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetWidth(int))); - height_menu = new KPopupMenu(menu); + height_menu = new TDEPopupMenu(menu); menu->insertItem(i18n("Height"), height_menu); connect(height_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHeight(int))); @@ -828,7 +828,7 @@ void MainWindow::updateScreenMenu() void MainWindow::createSessionMenu() { - session_menu = new KPopupMenu(); + session_menu = new TDEPopupMenu(); actionCollection()->action("add_tab")->plug(session_menu); actionCollection()->action("add_tab_twohorizontal")->plug(session_menu); @@ -1071,7 +1071,7 @@ void MainWindow::moveEvent(TQMoveEvent* e) slotUpdateSize(); } - KMainWindow::moveEvent(e); + TDEMainWindow::moveEvent(e); } void MainWindow::slotSetFullScreen(bool state) diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h index a4751ff..e98a228 100644 --- a/yakuake/src/main_window.h +++ b/yakuake/src/main_window.h @@ -48,7 +48,7 @@ class KAboutApplication; class KAboutKDE; -class MainWindow : public KMainWindow, virtual public DCOPInterface +class MainWindow : public TDEMainWindow, virtual public DCOPInterface { Q_OBJECT @@ -183,11 +183,11 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface KWinModule desk_info; /* Main menu. */ - KPopupMenu* menu; - KPopupMenu* session_menu; - KPopupMenu* screen_menu; - KPopupMenu* width_menu; - KPopupMenu* height_menu; + TDEPopupMenu* menu; + TDEPopupMenu* session_menu; + TDEPopupMenu* screen_menu; + TDEPopupMenu* width_menu; + TDEPopupMenu* height_menu; /* Global Key shortcut. */ TDEGlobalAccel* global_key; @@ -209,11 +209,11 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface enum PopupIDs { Focus }; - KAction* remove_tab_action; - KAction* split_horiz_action; - KAction* split_vert_action; - KAction* remove_term_action; - KToggleFullScreenAction* full_screen_action; + TDEAction* remove_tab_action; + TDEAction* split_horiz_action; + TDEAction* split_vert_action; + TDEAction* remove_term_action; + TDEToggleFullScreenAction* full_screen_action; KDialogBase* first_run_dialog; @@ -222,10 +222,10 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface private slots: - void slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState); - void slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState); - void slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState); - void slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState); + void slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState); + void slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState); + void slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState); + void slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState); void slotInitSkin(); void slotUpdateSize(); diff --git a/yakuake/src/skin_list_item.cpp b/yakuake/src/skin_list_item.cpp index d9f3543..29893cc 100644 --- a/yakuake/src/skin_list_item.cpp +++ b/yakuake/src/skin_list_item.cpp @@ -22,9 +22,9 @@ #include -SkinListItem::SkinListItem(KListView* parent, const TQString& fancy_name, +SkinListItem::SkinListItem(TDEListView* parent, const TQString& fancy_name, const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir) - : KListViewItem(parent, fancy_name) + : TDEListViewItem(parent, fancy_name) { setName(name); setAuthor(author); diff --git a/yakuake/src/skin_list_item.h b/yakuake/src/skin_list_item.h index 8f06ddc..5ea2c1f 100644 --- a/yakuake/src/skin_list_item.h +++ b/yakuake/src/skin_list_item.h @@ -22,10 +22,10 @@ class TQSimpleRichText; -class SkinListItem : public KListViewItem +class SkinListItem : public TDEListViewItem { public: - explicit SkinListItem(KListView* parent, const TQString& fancy_name, + explicit SkinListItem(TDEListView* parent, const TQString& fancy_name, const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir); ~SkinListItem(); diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp index 39586c9..65f9685 100644 --- a/yakuake/src/skin_settings.cpp +++ b/yakuake/src/skin_settings.cpp @@ -55,8 +55,8 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency skinbglayout->invalidate(); skins_list->header()->hide(); - skins_list->setSelectionModeExt(KListView::Single); - skins_list->setResizeMode(KListView::LastColumn); + skins_list->setSelectionModeExt(TDEListView::Single); + skins_list->setResizeMode(TDEListView::LastColumn); skins_list->setRootIsDecorated(false); skins_list->setDragEnabled(false); skins_list->setAcceptDrops(false); diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui index 3f29641..c8df636 100644 --- a/yakuake/src/skin_settings_ui.ui +++ b/yakuake/src/skin_settings_ui.ui @@ -95,7 +95,7 @@ - + Skin diff --git a/yakuake/src/tab_bar.cpp b/yakuake/src/tab_bar.cpp index 05a5a8c..641373b 100644 --- a/yakuake/src/tab_bar.cpp +++ b/yakuake/src/tab_bar.cpp @@ -236,7 +236,7 @@ void TabBar::setPixmaps(const TQString& skin) minus_button->setDownPixmap(url.dirPath() + config.readEntry("down_image", "")); } -void TabBar::setSessionMenu(KPopupMenu* menu) +void TabBar::setSessionMenu(TDEPopupMenu* menu) { plus_button->setPopupMenu(menu); } diff --git a/yakuake/src/tab_bar.h b/yakuake/src/tab_bar.h index 32846ff..16afe3c 100644 --- a/yakuake/src/tab_bar.h +++ b/yakuake/src/tab_bar.h @@ -40,7 +40,7 @@ class TabBar : public TranslucentWidget bool translucency = false, const TQString& skin = "default"); ~TabBar(); - void setSessionMenu(KPopupMenu* menu); + void setSessionMenu(TDEPopupMenu* menu); int pressedPosition(); void resetPressedPosition(); diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp index c5c9b98..ed07869 100644 --- a/yakuake/src/tabbed_widget.cpp +++ b/yakuake/src/tabbed_widget.cpp @@ -66,28 +66,28 @@ int TabbedWidget::pressedPosition() void TabbedWidget::createContextMenu() { - context_menu = new KPopupMenu(); + context_menu = new TDEPopupMenu(); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("split_horizontally")->plug(context_menu); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("split_vertically")->plug(context_menu); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("remove_terminal")->plug(context_menu); context_menu->insertSeparator(); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_left")->plug(context_menu); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_right")->plug(context_menu); context_menu->insertSeparator(); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("edit_name")->plug(context_menu); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("remove_tab")->plug(context_menu); } @@ -452,16 +452,16 @@ void TabbedWidget::mousePressEvent(TQMouseEvent* e) if (!context_menu) createContextMenu(); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_left")->setEnabled((position - 1 > 0)); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1)); context_menu->exec(TQCursor::pos()); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_left")->setEnabled(true); - static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> + static_cast(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> action("move_tab_right")->setEnabled(true); } } diff --git a/yakuake/src/tabbed_widget.h b/yakuake/src/tabbed_widget.h index 4d0a5f3..722e6b6 100644 --- a/yakuake/src/tabbed_widget.h +++ b/yakuake/src/tabbed_widget.h @@ -31,7 +31,7 @@ #include -class KPopupMenu; +class TDEPopupMenu; class TabbedWidget : public TranslucentWidget { @@ -138,7 +138,7 @@ class TabbedWidget : public TranslucentWidget TQValueList areas; TQValueList captions; - KPopupMenu* context_menu; + TDEPopupMenu* context_menu; private slots: diff --git a/yakuake/src/title_bar.cpp b/yakuake/src/title_bar.cpp index 3864ec8..0d505e9 100644 --- a/yakuake/src/title_bar.cpp +++ b/yakuake/src/title_bar.cpp @@ -56,7 +56,7 @@ void TitleBar::setFocusButtonEnabled(bool enable) focus_button->setToggled(enable); } -void TitleBar::setConfigurationMenu(KPopupMenu* menu) +void TitleBar::setConfigurationMenu(TDEPopupMenu* menu) { config_button->setPopupMenu(menu); } diff --git a/yakuake/src/title_bar.h b/yakuake/src/title_bar.h index c0ca941..09d298e 100644 --- a/yakuake/src/title_bar.h +++ b/yakuake/src/title_bar.h @@ -47,7 +47,7 @@ class TitleBar : public TQWidget void setFocusButtonEnabled(bool enable); - void setConfigurationMenu(KPopupMenu* menu); + void setConfigurationMenu(TDEPopupMenu* menu); void reloadSkin(const TQString& skin);