From 365c96509b4a4509c1aad0956563c9b28da8edc4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 5 Nov 2023 15:24:24 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- yakuake/src/session.cpp | 16 ++++++++-------- yakuake/src/session.h | 2 +- yakuake/src/tabbed_widget.cpp | 10 +++++----- yakuake/src/terminal_splitter.cpp | 6 +++--- yakuake/src/terminal_splitter.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp index c7d5581..6a7101b 100644 --- a/yakuake/src/session.cpp +++ b/yakuake/src/session.cpp @@ -33,7 +33,7 @@ Session::Session(TQWidget* parent, SessionType type, const char* name) : TQObjec focus_watcher = new TerminalFocusWatcher(this); connect(focus_watcher, TQT_SIGNAL(focusChanged()), this, TQT_SLOT(slotFocusChanged())); - base_widget = new TerminalSplitter(Qt::Horizontal, parent, "base"); + base_widget = new TerminalSplitter(TQt::Horizontal, parent, "base"); connect(base_widget, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLastTerminalClosed())); setenv("DCOP_YAKUAKE_SESSION", TQString::number(session_id).ascii(), 1); @@ -169,7 +169,7 @@ void Session::splitHorizontally() void Session::splitHorizontally(int terminal_id) { if (terminal_widgets[terminal_id]) - split(terminal_widgets[terminal_id], Qt::Horizontal); + split(terminal_widgets[terminal_id], TQt::Horizontal); } void Session::splitVertically() @@ -184,7 +184,7 @@ void Session::splitVertically() void Session::splitVertically(int terminal_id) { if (terminal_widgets[terminal_id]) - split(terminal_widgets[terminal_id], Qt::Vertical); + split(terminal_widgets[terminal_id], TQt::Vertical); } void Session::removeTerminal() @@ -241,7 +241,7 @@ void Session::createInitialSplits(SessionType type) case TwoVertical: { - base_widget->setOrientation(Qt::Vertical); + base_widget->setOrientation(TQt::Vertical); int splitter_height = base_widget->height(); @@ -263,12 +263,12 @@ void Session::createInitialSplits(SessionType type) int splitter_height = base_widget->height(); - base_widget->setOrientation(Qt::Vertical); + base_widget->setOrientation(TQt::Vertical); - TerminalSplitter* upper_splitter = new TerminalSplitter(Qt::Horizontal, base_widget); + TerminalSplitter* upper_splitter = new TerminalSplitter(TQt::Horizontal, base_widget); connect(upper_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup())); - TerminalSplitter* lower_splitter = new TerminalSplitter(Qt::Horizontal, base_widget); + TerminalSplitter* lower_splitter = new TerminalSplitter(TQt::Horizontal, base_widget); connect(lower_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup())); Terminal* terminal = addTerminal(upper_splitter); @@ -300,7 +300,7 @@ void Session::createInitialSplits(SessionType type) } } -void Session::split(TQWidget* active_terminal, Qt::Orientation o) +void Session::split(TQWidget* active_terminal, TQt::Orientation o) { TerminalSplitter* splitter = static_cast(active_terminal->parentWidget()); if (!splitter) return; diff --git a/yakuake/src/session.h b/yakuake/src/session.h index abfa979..329ae80 100644 --- a/yakuake/src/session.h +++ b/yakuake/src/session.h @@ -79,7 +79,7 @@ class Session : public TQObject private: void createInitialSplits(SessionType); - void split(TQWidget* active_terminal, Qt::Orientation o); + void split(TQWidget* active_terminal, TQt::Orientation o); Terminal* addTerminal(TQWidget* parent); bool checkFocusWidget(); diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp index c8bb440..1c3fcc7 100644 --- a/yakuake/src/tabbed_widget.cpp +++ b/yakuake/src/tabbed_widget.cpp @@ -441,12 +441,12 @@ void TabbedWidget::mousePressEvent(TQMouseEvent* e) for (position = 0, width = 0; (position < int(areas.count())) && (e->x() >= width); position++) width += areas[position]; - if ((e->x() <= width) && (e->button() == Qt::LeftButton) && !(current_position == position - 1)) + if ((e->x() <= width) && (e->button() == TQt::LeftButton) && !(current_position == position - 1)) { pressed = true; pressed_position = position - 1; } - else if ((e->x() <= width) && (e->button() == Qt::RightButton)) + else if ((e->x() <= width) && (e->button() == TQt::RightButton)) { pressed_position = position - 1; @@ -479,7 +479,7 @@ void TabbedWidget::mouseReleaseEvent(TQMouseEvent* e) for (position = 0, width = 0; (position < int(areas.count())) && (e->x() >= width); position++) width += areas[position]; - if ((e->x() <= width) && (e->button() == Qt::LeftButton) && !(current_position == position - 1)) + if ((e->x() <= width) && (e->button() == TQt::LeftButton) && !(current_position == position - 1)) { if (pressed && pressed_position == (position - 1)) { @@ -509,11 +509,11 @@ void TabbedWidget::mouseDoubleClickEvent(TQMouseEvent* e) for (position = 0, width = 0; (position < int(areas.count())) && (e->x() >= width); position++) width += areas[position]; - if ((e->x() <= width) && (e->button() == Qt::LeftButton) && current_position == position - 1) + if ((e->x() <= width) && (e->button() == TQt::LeftButton) && current_position == position - 1) { interactiveRename(position - 1); } - else if ((e->x() > width) && (e->button() == Qt::LeftButton)) + else if ((e->x() > width) && (e->button() == TQt::LeftButton)) emit addItem(); } diff --git a/yakuake/src/terminal_splitter.cpp b/yakuake/src/terminal_splitter.cpp index f2fe4c6..a717684 100644 --- a/yakuake/src/terminal_splitter.cpp +++ b/yakuake/src/terminal_splitter.cpp @@ -16,7 +16,7 @@ #include -TerminalSplitter::TerminalSplitter(Qt::Orientation o, TQWidget* parent, const char* name) +TerminalSplitter::TerminalSplitter(TQt::Orientation o, TQWidget* parent, const char* name) : TQSplitter(o, parent, name) { is_shutting_down = false; @@ -102,7 +102,7 @@ void TerminalSplitter::recursiveCleanup() else { // Update minimum sizes. - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { int minimumWidth = (terminalCount() > 1) ? terminalCount()*150+handleWidth() : terminalCount()*150; @@ -110,7 +110,7 @@ void TerminalSplitter::recursiveCleanup() setMinimumSize(TQSize(minimumWidth, minimumHeight())); } - else if (orientation() == Qt::Vertical) + else if (orientation() == TQt::Vertical) { int minimumHeight = (terminalCount() > 1) ? terminalCount()*70+handleWidth() : terminalCount()*70; diff --git a/yakuake/src/terminal_splitter.h b/yakuake/src/terminal_splitter.h index 58e44f1..353f241 100644 --- a/yakuake/src/terminal_splitter.h +++ b/yakuake/src/terminal_splitter.h @@ -23,7 +23,7 @@ class TerminalSplitter : public TQSplitter public: - explicit TerminalSplitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0); + explicit TerminalSplitter(TQt::Orientation o, TQWidget* parent=0, const char* name=0); ~TerminalSplitter(); void focusNext(); -- cgit v1.2.3