TDE
/
yakuake
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/yakuake
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/14/head
Michele Calgaro 5 months ago
parent 4d40f6d092
commit c62146fac7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File

132
yakuake/src/main_window.cpp
Unescape View File

@ -66,10 +66,10 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
Settings::setSkin("default"); Settings::setSkin("default");
// Initialize access key. // Initialize access key.
global_key = new TDEGlobalAccel(TQT_TQOBJECT(this)); global_key = new TDEGlobalAccel(this);
global_key->insert("AccessKey", i18n("Open/Retract Yakuake"), global_key->insert("AccessKey", i18n("Open/Retract Yakuake"),
i18n("Slides the Yakuake window in and out"), i18n("Slides the Yakuake window in and out"),
Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState())); Key_F12, 0, this, TQT_SLOT(slotToggleState()));
global_key->readSettings(&config); global_key->readSettings(&config);
global_key->updateConnections(); global_key->updateConnections();
@ -82,70 +82,70 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
action = new TDEAction(i18n("New Session"), SmallIcon("tab_new"), shortcut, action = new TDEAction(i18n("New Session"), SmallIcon("tab_new"), shortcut,
TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()), this, TQT_SLOT(slotAddSession()),
actionCollection(), "add_tab"); actionCollection(), "add_tab");
action = new TDEAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"), action = new TDEAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()), 0, this, TQT_SLOT(slotAddSessionTwoVertical()),
actionCollection(), "add_tab_twohorizontal"); actionCollection(), "add_tab_twohorizontal");
action = new TDEAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"), action = new TDEAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()), 0, this, TQT_SLOT(slotAddSessionTwoHorizontal()),
actionCollection(), "add_tab_twovertical"); actionCollection(), "add_tab_twovertical");
action = new TDEAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), action = new TDEAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()), 0, this, TQT_SLOT(slotAddSessionQuad()),
actionCollection(), "add_tab_quad"); actionCollection(), "add_tab_quad");
action = new TDEAction(i18n("Go to Next Terminal"), SmallIcon("go-next"), action = new TDEAction(i18n("Go to Next Terminal"), SmallIcon("go-next"),
"Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()), "Ctrl+Shift+Up", this, TQT_SLOT(slotFocusNextSplit()),
actionCollection(), "focus_next_terminal"); actionCollection(), "focus_next_terminal");
action = new TDEAction(i18n("Go to Previous Terminal"), SmallIcon("go-previous"), action = new TDEAction(i18n("Go to Previous Terminal"), SmallIcon("go-previous"),
"Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()), "Ctrl+Shift+Down", this, TQT_SLOT(slotFocusPreviousSplit()),
actionCollection(), "focus_previous_terminal"); actionCollection(), "focus_previous_terminal");
action = new TDEAction(i18n("Paste"), SmallIcon("edit-paste"), SHIFT+Key_Insert, action = new TDEAction(i18n("Paste"), SmallIcon("edit-paste"), SHIFT+Key_Insert,
TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), this, TQT_SLOT(slotPasteClipboard()),
actionCollection(), "paste_clipboard"); actionCollection(), "paste_clipboard");
action = new TDEAction(i18n("Paste Selection"), SmallIcon("edit-paste"), action = new TDEAction(i18n("Paste Selection"), SmallIcon("edit-paste"),
CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), CTRL+SHIFT+Key_Insert, this, TQT_SLOT(slotPasteSelection()),
actionCollection(), "paste_selection"); actionCollection(), "paste_selection");
action = new TDEAction(i18n("Rename Session..."), SmallIcon("edit"), action = new TDEAction(i18n("Rename Session..."), SmallIcon("edit"),
"Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()), "Alt+Ctrl+S", this, TQT_SLOT(slotInteractiveRename()),
actionCollection(), "edit_name"); actionCollection(), "edit_name");
action = new TDEAction(i18n("Increase Width"), SmallIcon("zoom-in"), action = new TDEAction(i18n("Increase Width"), SmallIcon("zoom-in"),
"Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()), "Alt+Shift+Right", this, TQT_SLOT(slotIncreaseSizeW()),
actionCollection(), "increasew"); actionCollection(), "increasew");
action = new TDEAction(i18n("Decrease Width"), SmallIcon("zoom-out"), action = new TDEAction(i18n("Decrease Width"), SmallIcon("zoom-out"),
"Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()), "Alt+Shift+Left", this, TQT_SLOT(slotDecreaseSizeW()),
actionCollection(), "decreasew"); actionCollection(), "decreasew");
action = new TDEAction(i18n("Increase Height"), SmallIcon("zoom-in"), action = new TDEAction(i18n("Increase Height"), SmallIcon("zoom-in"),
"Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()), "Alt+Shift+Down", this, TQT_SLOT(slotIncreaseSizeH()),
actionCollection(), "increaseh"); actionCollection(), "increaseh");
action = new TDEAction(i18n("Decrease Height"), SmallIcon("zoom-out"), action = new TDEAction(i18n("Decrease Height"), SmallIcon("zoom-out"),
"Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()), "Alt+Shift+Up", this, TQT_SLOT(slotDecreaseSizeH()),
actionCollection(), "decreaseh"); actionCollection(), "decreaseh");
action = new TDEAction(i18n("Configure Global Shortcuts..."), action = new TDEAction(i18n("Configure Global Shortcuts..."),
SmallIcon("configure_shortcuts"), 0, SmallIcon("configure_shortcuts"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()), this, TQT_SLOT(slotSetAccessKey()),
actionCollection(), "global_shortcuts"); actionCollection(), "global_shortcuts");
action = new TDEAction(i18n("Quit"), SmallIcon("system-log-out"), 0, TQT_TQOBJECT(this), action = new TDEAction(i18n("Quit"), SmallIcon("system-log-out"), 0, this,
TQT_SLOT(close()), actionCollection(), "quit"); TQT_SLOT(close()), actionCollection(), "quit");
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(slotSetControlKeys()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOpenSettingsDialog()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(slotOpenSettingsDialog()), actionCollection());
KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutApp()), actionCollection()); KStdAction::aboutApp(this, TQT_SLOT(slotOpenAboutApp()), actionCollection());
KStdAction::aboutKDE(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutKDE()), actionCollection()); KStdAction::aboutKDE(this, TQT_SLOT(slotOpenAboutKDE()), actionCollection());
KStdAction::whatsThis(TQT_TQOBJECT(this), TQT_SLOT(whatsThis()), actionCollection()); KStdAction::whatsThis(this, TQT_SLOT(whatsThis()), actionCollection());
full_screen_action = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateFullScreen()), actionCollection(), this); full_screen_action = KStdAction::fullScreen(this, TQT_SLOT(slotUpdateFullScreen()), actionCollection(), this);
connect(full_screen_action, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFullScreen(bool))); connect(full_screen_action, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFullScreen(bool)));
createMenu(); createMenu();
createSessionMenu(); createSessionMenu();
@ -153,42 +153,42 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
createTabsBar(); createTabsBar();
action = new TDEAction(i18n("Go to Next Session"), SmallIcon("go-next"), action = new TDEAction(i18n("Go to Next Session"), SmallIcon("go-next"),
"Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()), "Shift+Right", tab_bar, TQT_SLOT(slotSelectNextItem()),
actionCollection(), "next_tab"); actionCollection(), "next_tab");
action = new TDEAction(i18n("Go to Previous Session"), SmallIcon("go-previous"), action = new TDEAction(i18n("Go to Previous Session"), SmallIcon("go-previous"),
"Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()), "Shift+Left", tab_bar, TQT_SLOT(slotSelectPreviousItem()),
actionCollection(), "previous_tab"); actionCollection(), "previous_tab");
action = new TDEAction(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()), "Ctrl+Shift+Left", tab_bar, TQT_SLOT(slotMoveItemLeft()),
actionCollection(), "move_tab_left"); actionCollection(), "move_tab_left");
action = new TDEAction(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()), "Ctrl+Shift+Right", tab_bar, TQT_SLOT(slotMoveItemRight()),
actionCollection(), "move_tab_right"); actionCollection(), "move_tab_right");
remove_tab_action = new TDEAction(i18n("Close Session"), SmallIcon("window-close"), 0, remove_tab_action = new TDEAction(i18n("Close Session"), SmallIcon("window-close"), 0,
TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab"); this, 0, actionCollection(), "remove_tab");
connect(remove_tab_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), connect(remove_tab_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState))); this, TQT_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState)));
split_horiz_action = new TDEAction(i18n("Split Terminal Horizontally"), SmallIcon("view_top_bottom"), split_horiz_action = new TDEAction(i18n("Split Terminal Horizontally"), SmallIcon("view_top_bottom"),
CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally"); CTRL+SHIFT+Key_T, this, 0, actionCollection(), "split_horizontally");
connect(split_horiz_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), connect(split_horiz_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState))); this, TQT_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState)));
split_vert_action = new TDEAction(i18n("Split Terminal Vertically"), SmallIcon("view_left_right"), split_vert_action = new TDEAction(i18n("Split Terminal Vertically"), SmallIcon("view_left_right"),
CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically"); CTRL+SHIFT+Key_L, this, 0, actionCollection(), "split_vertically");
connect(split_vert_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), connect(split_vert_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState))); this, TQT_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState)));
remove_term_action = new TDEAction(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"); CTRL+SHIFT+Key_R, this, 0, actionCollection(), "remove_terminal");
connect(remove_term_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), connect(remove_term_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState))); this, TQT_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState)));
TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this)); TQSignalMapper* tab_selection_mapper = new TQSignalMapper(this);
connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int))); connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotSelectTabPosition(int)));
for (uint i = 1; i <= 12; ++i) for (uint i = 1; i <= 12; ++i)
{ {
@ -205,18 +205,18 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
// Add first session. // Add first session.
slotAddSession(); slotAddSession();
connect(kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit())); connect(kapp, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(slotAboutToQuit()));
// No need for this if we're not going to use pseudo-translucency. // No need for this if we're not going to use pseudo-translucency.
if (use_translucency) if (use_translucency)
connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateBackgroundState())); connect(kapp, TQT_SIGNAL(backgroundChanged(int)), this, TQT_SLOT(slotUpdateBackgroundState()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(addItem()), TQT_TQOBJECT(this), TQT_SLOT(slotAddSession())); connect(tab_bar, TQT_SIGNAL(addItem()), this, TQT_SLOT(slotAddSession()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(removeItem()), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSession())); connect(tab_bar, TQT_SIGNAL(removeItem()), this, TQT_SLOT(slotRemoveSession()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(itemSelected(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectSession(int))); connect(tab_bar, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotSelectSession(int)));
connect(&desk_info, TQT_SIGNAL(workAreaChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize())); connect(&desk_info, TQT_SIGNAL(workAreaChanged()), this, TQT_SLOT(slotUpdateSize()));
connect(&poller, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotPollMouse())); connect(&poller, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollMouse()));
// Startup notification popup. // Startup notification popup.
if (Settings::popup() && !Settings::firstrun()) if (Settings::popup() && !Settings::firstrun())
@ -225,8 +225,8 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
// First run dialog. // First run dialog.
if (Settings::firstrun()) if (Settings::firstrun())
{ {
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState())); TQTimer::singleShot(0, this, TQT_SLOT(slotToggleState()));
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFirstRunDialog())); TQTimer::singleShot(0, this, TQT_SLOT(slotOpenFirstRunDialog()));
} }
else if (Settings::poll()) else if (Settings::poll())
toggleMousePoll(true); toggleMousePoll(true);
@ -352,8 +352,8 @@ void MainWindow::slotAddSessionQuad()
void MainWindow::slotAddSession(Session::SessionType type) void MainWindow::slotAddSession(Session::SessionType type)
{ {
Session* session = new Session(widgets_stack, type); Session* session = new Session(widgets_stack, type);
connect(session, TQT_SIGNAL(destroyed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSessionDestroyed(int))); connect(session, TQT_SIGNAL(destroyed(int)), this, TQT_SLOT(slotSessionDestroyed(int)));
connect(session, TQT_SIGNAL(titleChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateTitle(const TQString&))); connect(session, TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(slotUpdateTitle(const TQString&)));
widgets_stack->addWidget(session->widget()); widgets_stack->addWidget(session->widget());
sessions_stack.insert(session->id(), session); sessions_stack.insert(session->id(), session);
@ -744,7 +744,7 @@ void MainWindow::createTabsBar()
/* Creates the tabs frame. */ /* Creates the tabs frame. */
tab_bar = new TabBar(this, "Session tab bar", use_translucency, Settings::skin()); tab_bar = new TabBar(this, "Session tab bar", use_translucency, Settings::skin());
connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(tab_bar), TQT_SIGNAL(updateBackground())); connect(this, TQT_SIGNAL(updateBackground()), tab_bar, TQT_SIGNAL(updateBackground()));
tab_bar->setSessionMenu(session_menu); tab_bar->setSessionMenu(session_menu);
@ -782,18 +782,18 @@ void MainWindow::createMenu()
if (TQApplication::desktop()->numScreens() > 1) if (TQApplication::desktop()->numScreens() > 1)
{ {
menu->insertItem(i18n("Open on screen"), screen_menu); menu->insertItem(i18n("Open on screen"), screen_menu);
connect(screen_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetScreen(int))); connect(screen_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetScreen(int)));
} }
width_menu = new TDEPopupMenu(menu); width_menu = new TDEPopupMenu(menu);
menu->insertItem(i18n("Width"), width_menu); menu->insertItem(i18n("Width"), width_menu);
connect(width_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetWidth(int))); connect(width_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetWidth(int)));
height_menu = new TDEPopupMenu(menu); height_menu = new TDEPopupMenu(menu);
menu->insertItem(i18n("Height"), height_menu); menu->insertItem(i18n("Height"), height_menu);
connect(height_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHeight(int))); connect(height_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeight(int)));
menu->insertItem(i18n("Keep open on focus change"), TQT_TQOBJECT(this), TQT_SLOT(slotSetFocusPolicy()), 0, Focus); menu->insertItem(i18n("Keep open on focus change"), this, TQT_SLOT(slotSetFocusPolicy()), 0, Focus);
menu->insertTitle(i18n("Settings")); menu->insertTitle(i18n("Settings"));
@ -909,7 +909,7 @@ void MainWindow::slotToggleState()
if (timer.isActive()) if (timer.isActive())
return; return;
KWinModule twin(TQT_TQOBJECT(this)); KWinModule twin(this);
if (state) if (state)
{ {
@ -922,7 +922,7 @@ void MainWindow::slotToggleState()
show(); show();
KWin::forceActiveWindow(winId()); KWin::forceActiveWindow(winId());
connect(&timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseHeight())); connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotIncreaseHeight()));
initWindowProps(); initWindowProps();
timer.start(10, false); timer.start(10, false);
state = !state; state = !state;
@ -939,7 +939,7 @@ void MainWindow::slotToggleState()
else if (full_screen) else if (full_screen)
this->setWindowState( this->windowState() & ~TQt::WindowFullScreen); this->setWindowState( this->windowState() & ~TQt::WindowFullScreen);
connect(&timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseHeight())); connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDecreaseHeight()));
timer.start(10, false); timer.start(10, false);
state = !state; state = !state;
} }
@ -1205,7 +1205,7 @@ void MainWindow::slotOpenSettingsDialog()
GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General"); GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General");
settings_dialog->addPage(general_settings, i18n("General"), "package_settings"); settings_dialog->addPage(general_settings, i18n("General"), "package_settings");
connect(general_settings, TQT_SIGNAL(updateSize(int, int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize(int, int, int))); connect(general_settings, TQT_SIGNAL(updateSize(int, int, int)), this, TQT_SLOT(slotUpdateSize(int, int, int)));
SkinSettings* skin_settings = new SkinSettings(settings_dialog, "Skins", use_translucency); SkinSettings* skin_settings = new SkinSettings(settings_dialog, "Skins", use_translucency);
settings_dialog->addPage(skin_settings, i18n("Skins"), "style"); settings_dialog->addPage(skin_settings, i18n("Skins"), "style");
@ -1213,8 +1213,8 @@ void MainWindow::slotOpenSettingsDialog()
connect(settings_dialog, TQT_SIGNAL(closeClicked()), skin_settings, TQT_SLOT(slotResetSelection())); connect(settings_dialog, TQT_SIGNAL(closeClicked()), skin_settings, TQT_SLOT(slotResetSelection()));
connect(settings_dialog, TQT_SIGNAL(cancelClicked()), skin_settings, TQT_SLOT(slotResetSelection())); connect(settings_dialog, TQT_SIGNAL(cancelClicked()), skin_settings, TQT_SLOT(slotResetSelection()));
connect(settings_dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSettings())); connect(settings_dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateSettings()));
connect(settings_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished())); connect(settings_dialog, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished()));
settings_dialog->show(); settings_dialog->show();
} }
@ -1226,10 +1226,10 @@ void MainWindow::slotOpenFirstRunDialog()
first_run_dialog = new KDialogBase(this, first_run_dialog = new KDialogBase(this,
"First Run Dialog", true, i18n("First Run"), "First Run Dialog", true, i18n("First Run"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
connect(first_run_dialog, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogOK())); connect(first_run_dialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFirstRunDialogOK()));
connect(first_run_dialog, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogCancel())); connect(first_run_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotFirstRunDialogCancel()));
connect(first_run_dialog, TQT_SIGNAL(closeClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstRunDialogCancel())); connect(first_run_dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotFirstRunDialogCancel()));
connect(first_run_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished())); connect(first_run_dialog, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished()));
FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog); FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog);
first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint()); first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint());
@ -1281,7 +1281,7 @@ void MainWindow::slotOpenAboutApp()
if (!about_app) if (!about_app)
{ {
about_app = new TDEAboutApplication(this, "About Yakuake"); about_app = new TDEAboutApplication(this, "About Yakuake");
connect(about_app, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished())); connect(about_app, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished()));
} }
if (full_screen) full_screen_action->activate(); if (full_screen) full_screen_action->activate();
@ -1297,7 +1297,7 @@ void MainWindow::slotOpenAboutKDE()
if (!about_kde) if (!about_kde)
{ {
about_kde = new TDEAboutKDE(this, "About KDE"); about_kde = new TDEAboutKDE(this, "About KDE");
connect(about_kde, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished())); connect(about_kde, TQT_SIGNAL(hidden()), this, TQT_SLOT(slotDialogFinished()));
} }
if (full_screen) full_screen_action->activate(); if (full_screen) full_screen_action->activate();

22
yakuake/src/tabbed_widget.cpp
Unescape View File

@ -68,26 +68,26 @@ void TabbedWidget::createContextMenu()
{ {
context_menu = new TDEPopupMenu(); context_menu = new TDEPopupMenu();
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("split_horizontally")->plug(context_menu); action("split_horizontally")->plug(context_menu);
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("split_vertically")->plug(context_menu); action("split_vertically")->plug(context_menu);
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("remove_terminal")->plug(context_menu); action("remove_terminal")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_left")->plug(context_menu); action("move_tab_left")->plug(context_menu);
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_right")->plug(context_menu); action("move_tab_right")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("edit_name")->plug(context_menu); action("edit_name")->plug(context_menu);
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("remove_tab")->plug(context_menu); action("remove_tab")->plug(context_menu);
} }
@ -452,16 +452,16 @@ void TabbedWidget::mousePressEvent(TQMouseEvent* e)
if (!context_menu) createContextMenu(); if (!context_menu) createContextMenu();
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_left")->setEnabled((position - 1 > 0)); action("move_tab_left")->setEnabled((position - 1 > 0));
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1)); action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1));
context_menu->exec(TQCursor::pos()); context_menu->exec(TQCursor::pos());
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_left")->setEnabled(true); action("move_tab_left")->setEnabled(true);
static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(parent()->parent())->actionCollection()->
action("move_tab_right")->setEnabled(true); action("move_tab_right")->setEnabled(true);
} }
} }

2
yakuake/src/terminal.cpp
Unescape View File

@ -36,7 +36,7 @@ Terminal::Terminal(TQWidget* parent, const char* name) : TQObject(parent, name)
{ {
TQStringList args = TQStringList(); TQStringList args = TQStringList();
args.append(TQString("Terminal-") + TQString::number(terminal_id)); args.append(TQString("Terminal-") + TQString::number(terminal_id));
terminal_part = (KParts::Part *) (factory->create(TQT_TQOBJECT(parent), 0, "KParts::Part", args)); terminal_part = (KParts::Part *) (factory->create(parent, 0, "KParts::Part", args));
} }
if (terminal_part != NULL) if (terminal_part != NULL)

4
yakuake/src/terminal_splitter.cpp
Unescape View File

@ -47,7 +47,7 @@ void TerminalSplitter::focusLast()
if (terminalCount(true) == 1) if (terminalCount(true) == 1)
{ {
TQWidget* w = TQT_TQWIDGET(child(0, TQCString("TEWidget"), true)); TQWidget* w = static_cast<TQWidget*>(child(0, TQCString("TEWidget"), true));
if (w) w->setFocus(); if (w) w->setFocus();
} }
else else
@ -93,7 +93,7 @@ void TerminalSplitter::recursiveCleanup()
while ((obj = it.current()) != 0) while ((obj = it.current()) != 0)
{ {
++it; ++it;
TerminalSplitter* splitter = static_cast<TerminalSplitter*>(TQT_TQWIDGET(obj)); TerminalSplitter* splitter = static_cast<TerminalSplitter*>(obj);
splitter->recursiveCleanup(); splitter->recursiveCleanup();
} }

Write Preview
Loading…
Cancel
Save