diff options
Diffstat (limited to 'konsole/konsole/konsole.cpp')
-rw-r--r-- | konsole/konsole/konsole.cpp | 418 |
1 files changed, 209 insertions, 209 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index ebfc76a24..dae5b834c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -290,7 +290,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,m_filterData(0) { isRestored = b_inRestore; - connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose())); + connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose())); no2command.setAutoDelete(true); menubar = menuBar(); @@ -298,8 +298,8 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo TDEAcceleratorManager::setNoAccel( menubar ); sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -359,7 +359,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged())); kapp->dcopClient()->setDefaultObject( "konsole" ); } @@ -476,23 +476,23 @@ void Konsole::makeGUI() if (m_menuCreated) return; if (m_tabbarSessionsCommands) - disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); m_menuCreated=true; // Remove the empty separator Qt inserts if the menu is empty on popup, @@ -517,7 +517,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); TDEAcceleratorManager::manage( m_signals ); } @@ -571,28 +571,28 @@ void Konsole::makeGUI() //bookmarks menu if (bookmarkHandler) - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( enterURL( const TQString&, const TQString& ))); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( enterURL( const TQString&, const TQString& ))); if (bookmarkHandlerSession) - connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( newSession( const TQString&, const TQString& ))); + connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( newSession( const TQString&, const TQString& ))); if (m_bookmarks) - connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); if (m_bookmarksSession) - connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); TDEAcceleratorManager::manage( m_schema ); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); TDEAcceleratorManager::manage( m_keytab ); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); //options menu if (m_options) @@ -602,7 +602,7 @@ void Konsole::makeGUI() // Tabbar selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, - TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); + TQ_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); @@ -610,7 +610,7 @@ void Konsole::makeGUI() // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); + TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); selectScrollbar->setItems(scrollitems); @@ -626,7 +626,7 @@ void Konsole::makeGUI() // Select Bell selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), actions, "bell"); + TQ_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") << i18n("System &Notification") @@ -641,27 +641,27 @@ void Konsole::makeGUI() actions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "fontsizeup" ), 0, this, - TQT_SLOT( biggerFont() ), actions, + TQ_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "fontsizedown" ), 0, this, - TQT_SLOT( smallerFont() ), actions, + TQ_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotSelectFont() ), actions, + TQ_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotInstallBitmapFonts() ), actions, + TQ_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -679,7 +679,7 @@ void Konsole::makeGUI() if (!b_fixedSize) { selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, - TQT_SLOT(slotSelectSize()), actions, "size"); + TQ_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") << i18n("80x24 (&VT100)") @@ -693,13 +693,13 @@ void Konsole::makeGUI() } TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), actions, "history"); + TQ_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(slotSaveSettings()), actions, "save_default"); + TQ_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); m_options->insertSeparator(); @@ -708,9 +708,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - TDEAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -722,13 +722,13 @@ void Konsole::makeGUI() { m_help->insertSeparator(1); m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"), - this, TQT_SLOT(showTip()), 0, -1, 2); + this, TQ_SLOT(showTip()), 0, -1, 2); } //the different session menus buildSessionMenus(); - connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int))); + connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int))); // Right mouse button menu if (m_rightButton) @@ -736,7 +736,7 @@ void Konsole::makeGUI() updateRMBMenu(); // show menubar / exit fullscreen TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this, - TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); + TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); @@ -744,7 +744,7 @@ void Konsole::makeGUI() m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); - connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); + connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection())); if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -822,26 +822,26 @@ void Konsole::makeGUI() if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->plug(m_tabPopupMenu); m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, - TQT_SLOT(slotTabRenameSession()) ); + TQ_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotTabToggleMasterMode() ), this); + TQ_SLOT( slotTabToggleMasterMode() ), this); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); @@ -849,30 +849,30 @@ void Konsole::makeGUI() { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) ); - m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQT_SLOT(slotTabResetColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); - connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), - TQT_SLOT( activateSession( int ) ) ); + connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ), + TQ_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this, - TQT_SLOT(slotTabCloseSession()) ); + TQ_SLOT(slotTabCloseSession()) ); if (m_options) { // Fill tab bar context menu @@ -887,16 +887,16 @@ void Konsole::makeGUI() viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this, - TQT_SLOT( slotTabbarToggleDynamicHide() ), this); + TQ_SLOT( slotTabbarToggleDynamicHide() ), this); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), - 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this); + 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -952,23 +952,23 @@ void Konsole::makeTabWidget() TDEAcceleratorManager::setNoAccel( tabwidget ); - connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); - connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*))); - connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), - TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); - connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)), - TQT_SLOT(slotTabbarContextMenu(const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int))); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession())); + connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*))); + connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)), + TQ_SLOT(slotTabbarContextMenu(const TQPoint &))); if (kapp->authorize("shell_access")) { - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession())); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession())); m_newSessionButton = new TQToolButton( tabwidget ); TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu")); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); m_newSessionButton->adjustSize(); m_newSessionButton->setPopup( m_tabbarSessionsCommands ); - connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession())); + connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession())); tabwidget->setCornerWidget( m_newSessionButton, BottomLeft ); m_newSessionButton->installEventFilter(this); @@ -977,7 +977,7 @@ void Konsole::makeTabWidget() m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_removeSessionButton->adjustSize(); m_removeSessionButton->setEnabled(false); - connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession())); + connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession())); tabwidget->setCornerWidget( m_removeSessionButton, BottomRight ); } @@ -1019,7 +1019,7 @@ void Konsole::makeBasicGUI() if (kapp->authorize("shell_access")) { m_tabbarSessionsCommands = new TDEPopupMenu( this ); TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); - connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); + connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int))); } m_session = new TDEPopupMenu(this); @@ -1062,20 +1062,20 @@ void Konsole::makeBasicGUI() // programs. if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); m_session_id=menubar->insertItem(m_session_string , m_session); m_edit_id=menubar->insertItem(m_edit_string, m_edit); @@ -1090,78 +1090,78 @@ void Konsole::makeBasicGUI() m_shortcuts = new TDEActionCollection(this); m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this, - TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); + TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); + TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); + TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this, - TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); + TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this, - TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); + TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this, - TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); + TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this, - TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); + TQ_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this, - TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); + TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this, - TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); + TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this, - TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); + TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, - this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->setEnabled(false); m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this, - TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); + TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), TQt::CTRL+TQt::ALT+TQt::Key_U, this, - TQT_SLOT( slotZModemUpload() ), + TQ_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), SmallIconSet("activity"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), SmallIconSet("silence"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); + TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this, - TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); + TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this, - TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); + TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu if (m_help) @@ -1170,42 +1170,42 @@ void Konsole::makeBasicGUI() // "Configure Shortcuts"). m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this, - TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit"); + TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); + m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit"); TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); - new TDEAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new TDEAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, - this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); + this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session"); new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, - this, TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + this, TQ_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new TDEAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new TDEAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1217,7 +1217,7 @@ void Konsole::makeBasicGUI() m_sessionList = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_sessionList ); - connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); + connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int))); } /** @@ -1990,7 +1990,7 @@ void Konsole::slotToggleMenubar() { } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); - TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle())); + TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle())); } updateRMBMenu(); } @@ -2142,12 +2142,12 @@ void Konsole::reparseConfiguration() b_sessionShortcutsMapped = false; // Mappings may have to be changed...get a fresh mapper. - disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); sl_sessionShortCuts.clear(); buildSessionMenus(); @@ -2380,12 +2380,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2403,12 +2403,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2503,7 +2503,7 @@ void Konsole::runSession(TESession* s) // give some time to get through the // resize events before starting up. - TQTimer::singleShot(100,s,TQT_SLOT(run())); + TQTimer::singleShot(100,s,TQ_SLOT(run())); } void Konsole::addSession(TESession* s) @@ -2537,7 +2537,7 @@ void Konsole::addSession(TESession* s) s->IconName(), 0, this, - TQT_SLOT(activateSession()), + TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -2676,7 +2676,7 @@ void Konsole::activateSession(TESession *s) } ra->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack + TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack tabwidget->showPage( se->widget() ); te = se->widget(); @@ -2953,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis TEWidget* te_old = te; te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); if (te_old) { initTEWidget(te, te_old); } @@ -2975,38 +2975,38 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis s->setMetaAsAltMode(b_metaAsAlt); // If you add any new signal-slot connection below, think about doing it in konsolePart too - connect( s,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*))); - connect( s, TQT_SIGNAL(updateTitle(TESession*)), - this, TQT_SLOT(updateTitle(TESession*))); - connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)), - this, TQT_SLOT(notifySessionState(TESession*, int))); - connect( s, TQT_SIGNAL(disableMasterModeConnections()), - this, TQT_SLOT(disableMasterModeConnections())); - connect( s, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections())); - connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - this, TQT_SLOT(slotRenameSession(TESession*, const TQString&))); - connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)), - this, TQT_SLOT(changeColumns(int)) ); - connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)), - this, TQT_SLOT(changeColLin(int,int))); - connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)), - this, TQT_SLOT(notifySize(int,int))); - connect( s, TQT_SIGNAL(zmodemDetected(TESession*)), - this, TQT_SLOT(slotZModemDetected(TESession*))); - connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)), - this, TQT_SLOT(slotUpdateSessionConfig(TESession*))); - connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)), - this, TQT_SLOT(slotResizeSession(TESession*, TQSize))); - connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)), - this,TQT_SLOT(changeTabTextColor(TESession*, int))); + connect( s,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*))); + connect( s, TQ_SIGNAL(updateTitle(TESession*)), + this, TQ_SLOT(updateTitle(TESession*))); + connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)), + this, TQ_SLOT(notifySessionState(TESession*, int))); + connect( s, TQ_SIGNAL(disableMasterModeConnections()), + this, TQ_SLOT(disableMasterModeConnections())); + connect( s, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections())); + connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + this, TQ_SLOT(slotRenameSession(TESession*, const TQString&))); + connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)), + this, TQ_SLOT(changeColumns(int)) ); + connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)), + this, TQ_SLOT(changeColLin(int,int))); + connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)), + this, TQ_SLOT(notifySize(int,int))); + connect( s, TQ_SIGNAL(zmodemDetected(TESession*)), + this, TQ_SLOT(slotZModemDetected(TESession*))); + connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)), + this, TQ_SLOT(slotUpdateSessionConfig(TESession*))); + connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)), + this, TQ_SLOT(slotResizeSession(TESession*, TQSize))); + connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)), + this,TQ_SLOT(changeTabTextColor(TESession*, int))); s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession s->setSchemaNo(schmno); @@ -3149,7 +3149,7 @@ void Konsole::doneSession(TESession* s) // Since the timer approach only works at good weather, // the whole construction is not suited to what it // should do. Affected is the TEEmulation::setConnect. - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } else close(); @@ -3482,7 +3482,7 @@ void Konsole::addSessionCommand(const TQString &path) } else { sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); } - connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); + connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); } @@ -3752,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) { TESession *from = from_it.current(); if(from->isMasterMode()) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() ); - disconnect( _se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( _se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); - disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); - disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); + disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); + disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); // TODO: "type" isn't passed properly Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis, @@ -3800,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) { else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } if (sessions.count()==1) @@ -3828,8 +3828,8 @@ void Konsole::attachSession(TESession* session) te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); te->resize(se_widget->size()); te->setSize(se_widget->Columns(), se_widget->Lines()); @@ -3845,7 +3845,7 @@ void Konsole::attachSession(TESession* session) TQString title=session->Title(); TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), - 0, this, TQT_SLOT(activateSession()), m_shortcuts); + 0, this, TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3859,20 +3859,20 @@ void Konsole::attachSession(TESession* session) if (m_menuCreated) ra->plug(m_view); - connect( session,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + connect( session,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); + connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); - connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); - connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); + connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); + connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); - connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); activateSession(session); } @@ -3934,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, TQHBoxLayout *hb = new TQHBoxLayout(mainFrame); m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool))); + connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool))); m_label = new TQLabel(i18n("&Number of lines: "), mainFrame); @@ -3945,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_label->setBuddy( m_size ); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -4039,8 +4039,8 @@ void Konsole::slotFindHistory() { if( !m_finddialog ) { m_finddialog = new KonsoleFind( this, "konsolefind", false); - connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind())); - connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone())); + connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind())); + connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone())); } TQString string; @@ -4059,7 +4059,7 @@ void Konsole::slotOpenSelection() delete m_filterData; m_openSelection->clear(); - disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int))); + disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int))); TQString selection = se->getEmulation()->getSelection(); TQString curdir = baseURL().path(); @@ -4074,7 +4074,7 @@ void Konsole::slotOpenSelection() KURIFilter::self()->filterURI( *(m_filterData) ); m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); - connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); + connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int))); } void Konsole::slotOpenURI(int) @@ -4345,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); - connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); - connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); + connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) ); + connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) ); m_editRegExp->setEnabled( false ); } } |