diff options
| -rw-r--r-- | yakuake/src/first_run_dialog.cpp | 4 | ||||
| -rw-r--r-- | yakuake/src/general_settings.cpp | 14 | ||||
| -rw-r--r-- | yakuake/src/image_button.cpp | 2 | ||||
| -rw-r--r-- | yakuake/src/main_window.cpp | 138 | ||||
| -rw-r--r-- | yakuake/src/session.cpp | 16 | ||||
| -rw-r--r-- | yakuake/src/skin_settings.cpp | 22 | ||||
| -rw-r--r-- | yakuake/src/tab_bar.cpp | 16 | ||||
| -rw-r--r-- | yakuake/src/tabbed_widget.cpp | 8 | ||||
| -rw-r--r-- | yakuake/src/terminal.cpp | 4 | ||||
| -rw-r--r-- | yakuake/src/title_bar.cpp | 4 |
10 files changed, 114 insertions, 114 deletions
diff --git a/yakuake/src/first_run_dialog.cpp b/yakuake/src/first_run_dialog.cpp index a201292..f745166 100644 --- a/yakuake/src/first_run_dialog.cpp +++ b/yakuake/src/first_run_dialog.cpp @@ -21,8 +21,8 @@ FirstRunDialog::FirstRunDialog(TQWidget* parent, const char* name) : FirstRunDialogUI(parent, name) { - connect(key_button, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), - this, TQT_SLOT(validateShortcut(const TDEShortcut&))); + connect(key_button, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQ_SLOT(validateShortcut(const TDEShortcut&))); } FirstRunDialog::~FirstRunDialog() diff --git a/yakuake/src/general_settings.cpp b/yakuake/src/general_settings.cpp index 114ffe1..7b90b1d 100644 --- a/yakuake/src/general_settings.cpp +++ b/yakuake/src/general_settings.cpp @@ -40,16 +40,16 @@ GeneralSettings::GeneralSettings(TQWidget* parent, const char* name) kcfg_screen->setEnabled(true); } - connect(kcfg_width, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSlider(int))); - connect(width_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSpinbox(int))); + connect(kcfg_width, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateWidthSlider(int))); + connect(width_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateWidthSpinbox(int))); - connect(kcfg_height, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSlider(int))); - connect(height_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSpinbox(int))); + connect(kcfg_height, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateHeightSlider(int))); + connect(height_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateHeightSpinbox(int))); - connect(kcfg_steps, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSpinbox(int))); - connect(steps_spinbox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSlider(int))); + connect(kcfg_steps, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateStepsSpinbox(int))); + connect(steps_spinbox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateStepsSlider(int))); - connect(kcfg_location, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateLocation(int))); + connect(kcfg_location, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateLocation(int))); } GeneralSettings::~GeneralSettings() diff --git a/yakuake/src/image_button.cpp b/yakuake/src/image_button.cpp index 67d15e1..eb9a209 100644 --- a/yakuake/src/image_button.cpp +++ b/yakuake/src/image_button.cpp @@ -63,7 +63,7 @@ void ImageButton::setPopupMenu(TQPopupMenu* menu) { popup_menu = menu; popup_timer = new TQTimer(this); - connect(popup_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showPopupMenu())); + connect(popup_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showPopupMenu())); } void ImageButton::showPopupMenu() diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp index d56df46..0592307 100644 --- a/yakuake/src/main_window.cpp +++ b/yakuake/src/main_window.cpp @@ -69,7 +69,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : global_key = new TDEGlobalAccel(this); global_key->insert("AccessKey", i18n("Open/Retract Yakuake"), i18n("Slides the Yakuake window in and out"), - Key_F12, 0, this, TQT_SLOT(slotToggleState())); + Key_F12, 0, this, TQ_SLOT(slotToggleState())); global_key->readSettings(&config); global_key->updateConnections(); @@ -82,70 +82,70 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : 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, - this, TQT_SLOT(slotAddSession()), + this, TQ_SLOT(slotAddSession()), actionCollection(), "add_tab"); action = new TDEAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"), - 0, this, TQT_SLOT(slotAddSessionTwoVertical()), + 0, this, TQ_SLOT(slotAddSessionTwoVertical()), actionCollection(), "add_tab_twohorizontal"); action = new TDEAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"), - 0, this, TQT_SLOT(slotAddSessionTwoHorizontal()), + 0, this, TQ_SLOT(slotAddSessionTwoHorizontal()), actionCollection(), "add_tab_twovertical"); action = new TDEAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), - 0, this, TQT_SLOT(slotAddSessionQuad()), + 0, this, TQ_SLOT(slotAddSessionQuad()), actionCollection(), "add_tab_quad"); action = new TDEAction(i18n("Go to Next Terminal"), SmallIcon("go-next"), - "Ctrl+Shift+Up", this, TQT_SLOT(slotFocusNextSplit()), + "Ctrl+Shift+Up", this, TQ_SLOT(slotFocusNextSplit()), actionCollection(), "focus_next_terminal"); action = new TDEAction(i18n("Go to Previous Terminal"), SmallIcon("go-previous"), - "Ctrl+Shift+Down", this, TQT_SLOT(slotFocusPreviousSplit()), + "Ctrl+Shift+Down", this, TQ_SLOT(slotFocusPreviousSplit()), actionCollection(), "focus_previous_terminal"); action = new TDEAction(i18n("Paste"), SmallIcon("edit-paste"), SHIFT+Key_Insert, - this, TQT_SLOT(slotPasteClipboard()), + this, TQ_SLOT(slotPasteClipboard()), actionCollection(), "paste_clipboard"); action = new TDEAction(i18n("Paste Selection"), SmallIcon("edit-paste"), - CTRL+SHIFT+Key_Insert, this, TQT_SLOT(slotPasteSelection()), + CTRL+SHIFT+Key_Insert, this, TQ_SLOT(slotPasteSelection()), actionCollection(), "paste_selection"); action = new TDEAction(i18n("Rename Session..."), SmallIcon("edit"), - "Alt+Ctrl+S", this, TQT_SLOT(slotInteractiveRename()), + "Alt+Ctrl+S", this, TQ_SLOT(slotInteractiveRename()), actionCollection(), "edit_name"); action = new TDEAction(i18n("Increase Width"), SmallIcon("zoom-in"), - "Alt+Shift+Right", this, TQT_SLOT(slotIncreaseSizeW()), + "Alt+Shift+Right", this, TQ_SLOT(slotIncreaseSizeW()), actionCollection(), "increasew"); action = new TDEAction(i18n("Decrease Width"), SmallIcon("zoom-out"), - "Alt+Shift+Left", this, TQT_SLOT(slotDecreaseSizeW()), + "Alt+Shift+Left", this, TQ_SLOT(slotDecreaseSizeW()), actionCollection(), "decreasew"); action = new TDEAction(i18n("Increase Height"), SmallIcon("zoom-in"), - "Alt+Shift+Down", this, TQT_SLOT(slotIncreaseSizeH()), + "Alt+Shift+Down", this, TQ_SLOT(slotIncreaseSizeH()), actionCollection(), "increaseh"); action = new TDEAction(i18n("Decrease Height"), SmallIcon("zoom-out"), - "Alt+Shift+Up", this, TQT_SLOT(slotDecreaseSizeH()), + "Alt+Shift+Up", this, TQ_SLOT(slotDecreaseSizeH()), actionCollection(), "decreaseh"); action = new TDEAction(i18n("Configure Global Shortcuts..."), SmallIcon("configure_shortcuts"), 0, - this, TQT_SLOT(slotSetAccessKey()), + this, TQ_SLOT(slotSetAccessKey()), actionCollection(), "global_shortcuts"); action = new TDEAction(i18n("Quit"), SmallIcon("system-log-out"), 0, this, - TQT_SLOT(close()), actionCollection(), "quit"); + TQ_SLOT(close()), actionCollection(), "quit"); - KStdAction::keyBindings(this, TQT_SLOT(slotSetControlKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotOpenSettingsDialog()), actionCollection()); - KStdAction::aboutApp(this, TQT_SLOT(slotOpenAboutApp()), actionCollection()); - KStdAction::aboutKDE(this, TQT_SLOT(slotOpenAboutKDE()), actionCollection()); - KStdAction::whatsThis(this, TQT_SLOT(whatsThis()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotSetControlKeys()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotOpenSettingsDialog()), actionCollection()); + KStdAction::aboutApp(this, TQ_SLOT(slotOpenAboutApp()), actionCollection()); + KStdAction::aboutKDE(this, TQ_SLOT(slotOpenAboutKDE()), actionCollection()); + KStdAction::whatsThis(this, TQ_SLOT(whatsThis()), actionCollection()); - full_screen_action = KStdAction::fullScreen(this, TQT_SLOT(slotUpdateFullScreen()), actionCollection(), this); - connect(full_screen_action, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFullScreen(bool))); + full_screen_action = KStdAction::fullScreen(this, TQ_SLOT(slotUpdateFullScreen()), actionCollection(), this); + connect(full_screen_action, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFullScreen(bool))); createMenu(); createSessionMenu(); @@ -153,47 +153,47 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : createTabsBar(); action = new TDEAction(i18n("Go to Next Session"), SmallIcon("go-next"), - "Shift+Right", tab_bar, TQT_SLOT(slotSelectNextItem()), + "Shift+Right", tab_bar, TQ_SLOT(slotSelectNextItem()), actionCollection(), "next_tab"); action = new TDEAction(i18n("Go to Previous Session"), SmallIcon("go-previous"), - "Shift+Left", tab_bar, TQT_SLOT(slotSelectPreviousItem()), + "Shift+Left", tab_bar, TQ_SLOT(slotSelectPreviousItem()), actionCollection(), "previous_tab"); action = new TDEAction(i18n("Move Session Left"), SmallIcon("back"), - "Ctrl+Shift+Left", tab_bar, TQT_SLOT(slotMoveItemLeft()), + "Ctrl+Shift+Left", tab_bar, TQ_SLOT(slotMoveItemLeft()), actionCollection(), "move_tab_left"); action = new TDEAction(i18n("Move Session Right"), SmallIcon("forward"), - "Ctrl+Shift+Right", tab_bar, TQT_SLOT(slotMoveItemRight()), + "Ctrl+Shift+Right", tab_bar, TQ_SLOT(slotMoveItemRight()), actionCollection(), "move_tab_right"); remove_tab_action = new TDEAction(i18n("Close Session"), SmallIcon("window-close"), 0, this, 0, actionCollection(), "remove_tab"); - connect(remove_tab_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - this, TQT_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState))); + connect(remove_tab_action, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + this, TQ_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState))); split_horiz_action = new TDEAction(i18n("Split Terminal Horizontally"), SmallIcon("view_top_bottom"), CTRL+SHIFT+Key_T, this, 0, actionCollection(), "split_horizontally"); - connect(split_horiz_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - this, TQT_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState))); + connect(split_horiz_action, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + this, TQ_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState))); split_vert_action = new TDEAction(i18n("Split Terminal Vertically"), SmallIcon("view_left_right"), CTRL+SHIFT+Key_L, this, 0, actionCollection(), "split_vertically"); - connect(split_vert_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - this, TQT_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState))); + connect(split_vert_action, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + this, TQ_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState))); remove_term_action = new TDEAction(i18n("Close Terminal"), SmallIcon("view_remove"), CTRL+SHIFT+Key_R, this, 0, actionCollection(), "remove_terminal"); - connect(remove_term_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - this, TQT_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState))); + connect(remove_term_action, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + this, TQ_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState))); TQSignalMapper* tab_selection_mapper = new TQSignalMapper(this); - connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotSelectTabPosition(int))); + connect(tab_selection_mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotSelectTabPosition(int))); for (uint i = 1; i <= 12; ++i) { 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, TQ_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit()); tab_selection_mapper->setMapping(tab_selection_action, i-1); } @@ -205,18 +205,18 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : // Add first session. slotAddSession(); - connect(kapp, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(slotAboutToQuit())); + connect(kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(slotAboutToQuit())); // No need for this if we're not going to use pseudo-translucency. if (use_translucency) - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), this, TQT_SLOT(slotUpdateBackgroundState())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), this, TQ_SLOT(slotUpdateBackgroundState())); - connect(tab_bar, TQT_SIGNAL(addItem()), this, TQT_SLOT(slotAddSession())); - connect(tab_bar, TQT_SIGNAL(removeItem()), this, TQT_SLOT(slotRemoveSession())); - connect(tab_bar, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotSelectSession(int))); - connect(&desk_info, TQT_SIGNAL(workAreaChanged()), this, TQT_SLOT(slotUpdateSize())); + connect(tab_bar, TQ_SIGNAL(addItem()), this, TQ_SLOT(slotAddSession())); + connect(tab_bar, TQ_SIGNAL(removeItem()), this, TQ_SLOT(slotRemoveSession())); + connect(tab_bar, TQ_SIGNAL(itemSelected(int)), this, TQ_SLOT(slotSelectSession(int))); + connect(&desk_info, TQ_SIGNAL(workAreaChanged()), this, TQ_SLOT(slotUpdateSize())); - connect(&poller, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollMouse())); + connect(&poller, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollMouse())); // Startup notification popup. if (Settings::popup() && !Settings::firstrun()) @@ -225,8 +225,8 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : // First run dialog. if (Settings::firstrun()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotToggleState())); - TQTimer::singleShot(0, this, TQT_SLOT(slotOpenFirstRunDialog())); + TQTimer::singleShot(0, this, TQ_SLOT(slotToggleState())); + TQTimer::singleShot(0, this, TQ_SLOT(slotOpenFirstRunDialog())); } else if (Settings::poll()) toggleMousePoll(true); @@ -352,8 +352,8 @@ void MainWindow::slotAddSessionQuad() void MainWindow::slotAddSession(Session::SessionType type) { Session* session = new Session(widgets_stack, type); - connect(session, TQT_SIGNAL(destroyed(int)), this, TQT_SLOT(slotSessionDestroyed(int))); - connect(session, TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(slotUpdateTitle(const TQString&))); + connect(session, TQ_SIGNAL(destroyed(int)), this, TQ_SLOT(slotSessionDestroyed(int))); + connect(session, TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(slotUpdateTitle(const TQString&))); widgets_stack->addWidget(session->widget()); sessions_stack.insert(session->id(), session); @@ -744,7 +744,7 @@ void MainWindow::createTabsBar() /* Creates the tabs frame. */ tab_bar = new TabBar(this, "Session tab bar", use_translucency, Settings::skin()); - connect(this, TQT_SIGNAL(updateBackground()), tab_bar, TQT_SIGNAL(updateBackground())); + connect(this, TQ_SIGNAL(updateBackground()), tab_bar, TQ_SIGNAL(updateBackground())); tab_bar->setSessionMenu(session_menu); @@ -782,18 +782,18 @@ void MainWindow::createMenu() if (TQApplication::desktop()->numScreens() > 1) { menu->insertItem(i18n("Open on screen"), screen_menu); - connect(screen_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetScreen(int))); + connect(screen_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetScreen(int))); } width_menu = new TDEPopupMenu(menu); menu->insertItem(i18n("Width"), width_menu); - connect(width_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetWidth(int))); + connect(width_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetWidth(int))); height_menu = new TDEPopupMenu(menu); menu->insertItem(i18n("Height"), height_menu); - connect(height_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeight(int))); + connect(height_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeight(int))); - menu->insertItem(i18n("Keep open on focus change"), this, TQT_SLOT(slotSetFocusPolicy()), 0, Focus); + menu->insertItem(i18n("Keep open on focus change"), this, TQ_SLOT(slotSetFocusPolicy()), 0, Focus); menu->insertTitle(i18n("Settings")); @@ -922,7 +922,7 @@ void MainWindow::slotToggleState() show(); KWin::forceActiveWindow(winId()); - connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotIncreaseHeight())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotIncreaseHeight())); initWindowProps(); timer.start(10, false); state = !state; @@ -939,7 +939,7 @@ void MainWindow::slotToggleState() else if (full_screen) this->setWindowState( this->windowState() & ~TQt::WindowFullScreen); - connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDecreaseHeight())); + connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDecreaseHeight())); timer.start(10, false); state = !state; } @@ -957,7 +957,7 @@ void MainWindow::slotIncreaseHeight() { step = steps; timer.stop(); - disconnect(&timer, TQT_SIGNAL(timeout()), 0, 0); + disconnect(&timer, TQ_SIGNAL(timeout()), 0, 0); mask_height = max_height; @@ -986,7 +986,7 @@ void MainWindow::slotDecreaseHeight() { step = 0; timer.stop(); - disconnect(&timer, TQT_SIGNAL(timeout()), 0, 0); + disconnect(&timer, TQ_SIGNAL(timeout()), 0, 0); hide(); @@ -1205,16 +1205,16 @@ void MainWindow::slotOpenSettingsDialog() GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General"); settings_dialog->addPage(general_settings, i18n("General"), "package_settings"); - connect(general_settings, TQT_SIGNAL(updateSize(int, int, int)), this, TQT_SLOT(slotUpdateSize(int, int, int))); + connect(general_settings, TQ_SIGNAL(updateSize(int, int, int)), this, TQ_SLOT(slotUpdateSize(int, int, int))); SkinSettings* skin_settings = new SkinSettings(settings_dialog, "Skins", use_translucency); settings_dialog->addPage(skin_settings, i18n("Skins"), "style"); - connect(skin_settings, TQT_SIGNAL(settingsChanged()), settings_dialog, TQT_SIGNAL(settingsChanged())); - connect(settings_dialog, TQT_SIGNAL(closeClicked()), skin_settings, TQT_SLOT(slotResetSelection())); - connect(settings_dialog, TQT_SIGNAL(cancelClicked()), skin_settings, TQT_SLOT(slotResetSelection())); + connect(skin_settings, TQ_SIGNAL(settingsChanged()), settings_dialog, TQ_SIGNAL(settingsChanged())); + connect(settings_dialog, TQ_SIGNAL(closeClicked()), skin_settings, TQ_SLOT(slotResetSelection())); + connect(settings_dialog, TQ_SIGNAL(cancelClicked()), skin_settings, TQ_SLOT(slotResetSelection())); - connect(settings_dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateSettings())); - connect(settings_dialog, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished())); + connect(settings_dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateSettings())); + connect(settings_dialog, TQ_SIGNAL(hidden()), this, TQ_SLOT(slotDialogFinished())); settings_dialog->show(); } @@ -1226,10 +1226,10 @@ void MainWindow::slotOpenFirstRunDialog() first_run_dialog = new KDialogBase(this, "First Run Dialog", true, i18n("First Run"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); - connect(first_run_dialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFirstRunDialogOK())); - connect(first_run_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotFirstRunDialogCancel())); - connect(first_run_dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotFirstRunDialogCancel())); - connect(first_run_dialog, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished())); + connect(first_run_dialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFirstRunDialogOK())); + connect(first_run_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotFirstRunDialogCancel())); + connect(first_run_dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(slotFirstRunDialogCancel())); + connect(first_run_dialog, TQ_SIGNAL(hidden()), this, TQ_SLOT(slotDialogFinished())); FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog); first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint()); @@ -1281,7 +1281,7 @@ void MainWindow::slotOpenAboutApp() if (!about_app) { about_app = new TDEAboutApplication(this, "About Yakuake"); - connect(about_app, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished())); + connect(about_app, TQ_SIGNAL(hidden()), this, TQ_SLOT(slotDialogFinished())); } if (full_screen) full_screen_action->activate(); @@ -1297,7 +1297,7 @@ void MainWindow::slotOpenAboutKDE() if (!about_kde) { about_kde = new TDEAboutKDE(this, "About KDE"); - connect(about_kde, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished())); + connect(about_kde, TQ_SIGNAL(hidden()), this, TQ_SLOT(slotDialogFinished())); } if (full_screen) full_screen_action->activate(); diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp index 6a7101b..e3678dc 100644 --- a/yakuake/src/session.cpp +++ b/yakuake/src/session.cpp @@ -31,10 +31,10 @@ Session::Session(TQWidget* parent, SessionType type, const char* name) : TQObjec active_terminal = NULL; focus_watcher = new TerminalFocusWatcher(this); - connect(focus_watcher, TQT_SIGNAL(focusChanged()), this, TQT_SLOT(slotFocusChanged())); + connect(focus_watcher, TQ_SIGNAL(focusChanged()), this, TQ_SLOT(slotFocusChanged())); base_widget = new TerminalSplitter(TQt::Horizontal, parent, "base"); - connect(base_widget, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLastTerminalClosed())); + connect(base_widget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLastTerminalClosed())); setenv("DCOP_YAKUAKE_SESSION", TQString::number(session_id).ascii(), 1); @@ -266,10 +266,10 @@ void Session::createInitialSplits(SessionType type) base_widget->setOrientation(TQt::Vertical); TerminalSplitter* upper_splitter = new TerminalSplitter(TQt::Horizontal, base_widget); - connect(upper_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup())); + connect(upper_splitter, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanup())); TerminalSplitter* lower_splitter = new TerminalSplitter(TQt::Horizontal, base_widget); - connect(lower_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup())); + connect(lower_splitter, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanup())); Terminal* terminal = addTerminal(upper_splitter); addTerminal(upper_splitter); @@ -333,7 +333,7 @@ void Session::split(TQWidget* active_terminal, TQt::Orientation o) TQValueList<int> splitter_sizes = splitter->sizes(); TerminalSplitter* new_splitter = new TerminalSplitter(o, splitter); - connect(new_splitter, TQT_SIGNAL(destroyed()), this, TQT_SLOT(cleanup())); + connect(new_splitter, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanup())); if (splitter->isFirst(active_terminal)) splitter->moveToFirst(new_splitter); @@ -362,9 +362,9 @@ Terminal* Session::addTerminal(TQWidget* parent) terminal->widget()->installEventFilter(focus_watcher); - connect(terminal, TQT_SIGNAL(destroyed(int)), this, TQT_SLOT(cleanup(int))); - connect(terminal, TQT_SIGNAL(titleChanged(TQWidget*, const TQString&)), - this, TQT_SLOT(slotTitleChange(TQWidget*, const TQString&))); + connect(terminal, TQ_SIGNAL(destroyed(int)), this, TQ_SLOT(cleanup(int))); + connect(terminal, TQ_SIGNAL(titleChanged(TQWidget*, const TQString&)), + this, TQ_SLOT(slotTitleChange(TQWidget*, const TQString&))); active_terminal = terminal->widget(); base_widget->setFocusProxy(terminal->widget()); diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp index dfa914f..4cb3fe0 100644 --- a/yakuake/src/skin_settings.cpp +++ b/yakuake/src/skin_settings.cpp @@ -63,11 +63,11 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency skins_list->setDropVisualizer(false); skins_list->setSortColumn(0); - connect(skins_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateRemoveButton())); - connect(skins_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateSkinSetting())); - connect(kcfg_skin, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateSelection(const TQString&))); - connect(install_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallSkin())); - connect(remove_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveSkin())); + connect(skins_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateRemoveButton())); + connect(skins_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateSkinSetting())); + connect(kcfg_skin, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUpdateSelection(const TQString&))); + connect(install_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallSkin())); + connect(remove_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveSkin())); skins_dir = locateLocal("data", "yakuake/"); @@ -195,11 +195,11 @@ void SkinSettings::slotInstallSkin() { TDEIO::ListJob* job = TDEIO::listRecursive("tar:" + install_skin_file, false, false); - connect(job, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotListSkinArchive(TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotListSkinArchive(TDEIO::Job*, const TDEIO::UDSEntryList&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotValidateSkinArchive(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotValidateSkinArchive(TDEIO::Job*))); } else failInstall(i18n("The installer was given a directory, not a file.")); @@ -276,7 +276,7 @@ void SkinSettings::checkForExistingSkin() { unlink(TQFile::encodeName(item->dir())); TDEIO::DeleteJob* job = TDEIO::del(KURL(item->dir()), false, false); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotInstallSkinArchive(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotInstallSkinArchive(TDEIO::Job*))); } else cleanupAfterInstall(); @@ -354,7 +354,7 @@ void SkinSettings::slotRemoveSkin() { unlink(TQFile::encodeName(selected_item->dir())); TDEIO::DeleteJob* job = TDEIO::del(KURL(selected_item->dir()), false, false); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotPopulate())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotPopulate())); if (selected_item->name() == Settings::skin()) { diff --git a/yakuake/src/tab_bar.cpp b/yakuake/src/tab_bar.cpp index 317243a..d33dc73 100644 --- a/yakuake/src/tab_bar.cpp +++ b/yakuake/src/tab_bar.cpp @@ -27,11 +27,11 @@ TabBar::TabBar(TQWidget* parent, const char* name, bool translucency, const TQSt { loadSkin(skin); - connect(plus_button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(addItem())); - connect(minus_button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(removeItem())); - connect(tabs_widget, TQT_SIGNAL(itemSelected(int)), this, TQT_SIGNAL(itemSelected(int))); - connect(tabs_widget, TQT_SIGNAL(addItem()), this, TQT_SIGNAL(addItem())); - connect(this, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(slotUpdateBackground())); + connect(plus_button, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(addItem())); + connect(minus_button, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(removeItem())); + connect(tabs_widget, TQ_SIGNAL(itemSelected(int)), this, TQ_SIGNAL(itemSelected(int))); + connect(tabs_widget, TQ_SIGNAL(addItem()), this, TQ_SIGNAL(addItem())); + connect(this, TQ_SIGNAL(updateBackground()), this, TQ_SLOT(slotUpdateBackground())); } TabBar::~TabBar() @@ -150,18 +150,18 @@ void TabBar::loadSkin(const TQString& skin) { tabs_widget = new TabbedWidget(this, "Tabbed widget", useTranslucency()); TQWhatsThis::add(tabs_widget, i18n("The tab bar allows you to switch between sessions.")); - connect(this, TQT_SIGNAL(updateBackground()), tabs_widget, TQT_SLOT(slotUpdateBackground())); + connect(this, TQ_SIGNAL(updateBackground()), tabs_widget, TQ_SLOT(slotUpdateBackground())); plus_button = new ImageButton(this, "Plus button", useTranslucency()); plus_button->setDelayedPopup(true); TQToolTip::add(plus_button, i18n("New Session")); TQWhatsThis::add(plus_button, i18n("Adds a new session. Press and hold to select session type from menu.")); - connect(this, TQT_SIGNAL(updateBackground()), plus_button, TQT_SLOT(slotUpdateBackground())); + connect(this, TQ_SIGNAL(updateBackground()), plus_button, TQ_SLOT(slotUpdateBackground())); minus_button = new ImageButton(this, "Minus button", useTranslucency()); TQToolTip::add(minus_button, i18n("Close Session")); TQWhatsThis::add(minus_button, i18n("Closes the active session.")); - connect(this, TQT_SIGNAL(updateBackground()), minus_button, TQT_SLOT(slotUpdateBackground())); + connect(this, TQ_SIGNAL(updateBackground()), minus_button, TQ_SLOT(slotUpdateBackground())); setPixmaps(skin); diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp index 86d2511..c654a7e 100644 --- a/yakuake/src/tabbed_widget.cpp +++ b/yakuake/src/tabbed_widget.cpp @@ -36,16 +36,16 @@ TabbedWidget::TabbedWidget(TQWidget* parent, const char* name, bool translucency if (root_pixmap) { - connect(root_pixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotUpdateBuffer(const TQPixmap &))); + connect(root_pixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotUpdateBuffer(const TQPixmap &))); root_pixmap->setCustomPainting(true); } inline_edit = new TQLineEdit(this); inline_edit->hide(); - connect(inline_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotRenameSelected())); - connect(inline_edit, TQT_SIGNAL(lostFocus()), inline_edit, TQT_SLOT(hide())); - connect(inline_edit, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotResetEditedPosition())); + connect(inline_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotRenameSelected())); + connect(inline_edit, TQ_SIGNAL(lostFocus()), inline_edit, TQ_SLOT(hide())); + connect(inline_edit, TQ_SIGNAL(lostFocus()), this, TQ_SLOT(slotResetEditedPosition())); selected_font = font(); unselected_font = font(); diff --git a/yakuake/src/terminal.cpp b/yakuake/src/terminal.cpp index 6dfb42e..6f7d14b 100644 --- a/yakuake/src/terminal.cpp +++ b/yakuake/src/terminal.cpp @@ -45,8 +45,8 @@ Terminal::Terminal(TQWidget* parent, const char* name) : TQObject(parent, name) terminal_widget->setFocusPolicy(TQWidget::WheelFocus); terminal_interface = (TerminalInterface *) (terminal_part->tqt_cast("TerminalInterface")); - connect(terminal_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater())); - connect(terminal_part, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(slotUpdateSessionTitle(const TQString &))); + connect(terminal_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteLater())); + connect(terminal_part, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(slotUpdateSessionTitle(const TQString &))); } } diff --git a/yakuake/src/title_bar.cpp b/yakuake/src/title_bar.cpp index e73e4b2..1be4302 100644 --- a/yakuake/src/title_bar.cpp +++ b/yakuake/src/title_bar.cpp @@ -26,8 +26,8 @@ TitleBar::TitleBar(TQWidget * parent, const char * name, const TQString & skin) loadSkin(skin); - connect(focus_button, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(slotSetFocusPolicy(bool))); - connect(quit_button, TQT_SIGNAL(clicked()), parent, TQT_SLOT(close())); + connect(focus_button, TQ_SIGNAL(toggled(bool)), parent, TQ_SLOT(slotSetFocusPolicy(bool))); + connect(quit_button, TQ_SIGNAL(clicked()), parent, TQ_SLOT(close())); } TitleBar::~TitleBar() |