summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/konsole.cpp38
-rw-r--r--konsole/konsole/konsole_part.cpp10
-rw-r--r--konsole/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--konsole/konsole/main.cpp4
-rw-r--r--konsole/konsole/schema.cpp4
-rw-r--r--konsole/konsole/session.cpp2
-rw-r--r--konsole/terminalhere/terminalhere.cpp2
7 files changed, 31 insertions, 31 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index c327c9fcf..45775f2e1 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -331,7 +331,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
if (isRestored) {
n_tabbar = wanted_tabbar;
- TDEConfig *c = TDEApplication::kApplication()->sessionConfig();
+ TDEConfig *c = tdeApp->sessionConfig();
// c->setDesktopGroup(); // Reads from wrong group
b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false);
}
@@ -359,9 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
}
-// connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
+// connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
- kapp->dcopClient()->setDefaultObject( "konsole" );
+ tdeApp->dcopClient()->setDefaultObject( "konsole" );
}
@@ -506,7 +506,7 @@ void Konsole::makeGUI()
TDEActionCollection* actions = actionCollection();
// Send Signal Menu -------------------------------------------------------------
- if (kapp->authorizeTDEAction("send_signal"))
+ if (tdeApp->authorizeTDEAction("send_signal"))
{
m_signals = new TDEPopupMenu(this);
m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP);
@@ -668,11 +668,11 @@ void Konsole::makeGUI()
selectSetEncoding->setCurrentItem (0);
selectSetEncoding->plug(m_options);
- if (kapp->authorizeTDEAction("keyboard"))
+ if (tdeApp->authorizeTDEAction("keyboard"))
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
// Schema
- if (kapp->authorizeTDEAction("schema"))
+ if (tdeApp->authorizeTDEAction("schema"))
m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
// Select size
@@ -960,7 +960,7 @@ void Konsole::makeTabWidget()
connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)),
TQ_SLOT(slotTabbarContextMenu(const TQPoint &)));
- if (kapp->authorize("shell_access")) {
+ if (tdeApp->authorize("shell_access")) {
connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession()));
m_newSessionButton = new TQToolButton( tabwidget );
@@ -1016,7 +1016,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
void Konsole::makeBasicGUI()
{
- if (kapp->authorize("shell_access")) {
+ if (tdeApp->authorize("shell_access")) {
m_tabbarSessionsCommands = new TDEPopupMenu( this );
TDEAcceleratorManager::manage( m_tabbarSessionsCommands );
connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int)));
@@ -1028,7 +1028,7 @@ void Konsole::makeBasicGUI()
TDEAcceleratorManager::manage( m_edit );
m_view = new TDEPopupMenu(this);
TDEAcceleratorManager::manage( m_view );
- if (kapp->authorizeTDEAction("bookmarks"))
+ if (tdeApp->authorizeTDEAction("bookmarks"))
{
bookmarkHandler = new KonsoleBookmarkHandler( this, true );
m_bookmarks = bookmarkHandler->menu();
@@ -1036,20 +1036,20 @@ void Konsole::makeBasicGUI()
bookmarks_menu_check();
}
- if (kapp->authorizeTDEAction("settings")) {
+ if (tdeApp->authorizeTDEAction("settings")) {
m_options = new TDEPopupMenu(this);
TDEAcceleratorManager::manage( m_options );
}
- if (kapp->authorizeTDEAction("help"))
+ if (tdeApp->authorizeTDEAction("help"))
m_help = helpMenu(0, false);
- if (kapp->authorizeTDEAction("konsole_rmb")) {
+ if (tdeApp->authorizeTDEAction("konsole_rmb")) {
m_rightButton = new TDEPopupMenu(this);
TDEAcceleratorManager::manage( m_rightButton );
}
- if (kapp->authorizeTDEAction("bookmarks"))
+ if (tdeApp->authorizeTDEAction("bookmarks"))
{
// Bookmarks that open new sessions.
bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false );
@@ -1133,7 +1133,7 @@ void Konsole::makeBasicGUI()
m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this,
TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
- if (kapp->authorizeTDEAction("zmodem_upload"))
+ if (tdeApp->authorizeTDEAction("zmodem_upload"))
m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
TQt::CTRL+TQt::ALT+TQt::Key_U, this,
TQ_SLOT( slotZModemUpload() ),
@@ -1239,7 +1239,7 @@ void Konsole::activateMenu()
*/
bool Konsole::queryClose()
{
- if(kapp->sessionSaving())
+ if(tdeApp->sessionSaving())
// saving session - do not even think about doing any kind of cleanup here
return true;
@@ -3394,7 +3394,7 @@ void Konsole::buildSessionMenus()
createSessionMenus();
- if (kapp->authorizeTDEAction("file_print"))
+ if (tdeApp->authorizeTDEAction("file_print"))
{
m_session->insertSeparator();
m_print->plug(m_session);
@@ -3494,7 +3494,7 @@ void Konsole::loadSessionCommands()
cmd_serial = 99;
cmd_first_screen = -1;
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
return;
addSessionCommand(TQString::null);
@@ -3583,7 +3583,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
void Konsole::loadScreenSessions()
{
- if (!kapp->authorize("shell_access"))
+ if (!tdeApp->authorize("shell_access"))
return;
TQCString screenDir = getenv("SCREENDIR");
if (screenDir.isEmpty())
@@ -4230,7 +4230,7 @@ void Konsole::slotZModemUpload()
void Konsole::slotZModemDetected(TESession *session)
{
- if (!kapp->authorize("zmodem_download")) return;
+ if (!tdeApp->authorize("zmodem_download")) return;
if(se != session)
activateSession(session);
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index be904d31b..ca275d40b 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -325,14 +325,14 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd)
void konsolePart::makeGUI()
{
- if (!kapp->authorizeTDEAction("konsole_rmb"))
+ if (!tdeApp->authorizeTDEAction("konsole_rmb"))
return;
actions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
// Send Signal Menu -------------------------------------------------------------
- if (kapp->authorizeTDEAction("send_signal"))
+ if (tdeApp->authorizeTDEAction("send_signal"))
{
m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget);
m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP);
@@ -347,7 +347,7 @@ void konsolePart::makeGUI()
}
// Settings Menu ----------------------------------------------------------------
- if (kapp->authorizeTDEAction("settings"))
+ if (tdeApp->authorizeTDEAction("settings"))
{
m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget);
@@ -388,7 +388,7 @@ void konsolePart::makeGUI()
selectSetEncoding->plug(m_options);
// Keyboard Options Menu ---------------------------------------------------
- if (kapp->authorizeTDEAction("keyboard"))
+ if (tdeApp->authorizeTDEAction("keyboard"))
{
m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget);
m_keytab->setCheckable(true);
@@ -397,7 +397,7 @@ void konsolePart::makeGUI()
}
// Schema Options Menu -----------------------------------------------------
- if (kapp->authorizeTDEAction("schema"))
+ if (tdeApp->authorizeTDEAction("schema"))
{
m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget);
m_schema->setCheckable(true);
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 16f8afb63..1b9f70c3c 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -55,7 +55,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
m_file = locateLocal( "data", "konsole/bookmarks.xml" );
KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false);
- manager->setEditorOptions(kapp->caption(), false);
+ manager->setEditorOptions(tdeApp->caption(), false);
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 9e5cca6de..282720278 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -289,7 +289,7 @@ extern "C" int TDE_EXPORT kdemain(int argc, char* argv[])
eargs.append( args->arg(i) );
if (title.isEmpty() &&
- (kapp->caption() == kapp->aboutData()->programName()))
+ (tdeApp->caption() == tdeApp->aboutData()->programName()))
{
title = TQFile::decodeName(shell); // program executed in the title bar
}
@@ -413,7 +413,7 @@ extern "C" int TDE_EXPORT kdemain(int argc, char* argv[])
}
}
- if (!kapp->authorizeTDEAction("size"))
+ if (!tdeApp->authorizeTDEAction("size"))
fixed_size = true;
// ///////////////////////////////////////////////
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 8778a1ee9..2f52dc6a7 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = kapp->palette().active().text();
+ m_table[fi].color = tdeApp->palette().active().text();
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}
@@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile()
if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
if (!(0 <= tr && tr <= 1 )) continue;
if (!(0 <= bo && bo <= 1 )) continue;
- m_table[fi].color = kapp->palette().active().base();
+ m_table[fi].color = tdeApp->palette().active().base();
m_table[fi].transparent = tr;
m_table[fi].bold = bo;
}
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index b66f4eddf..4bb930266 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -181,7 +181,7 @@ void TESession::run()
return;
}
- TQString appId=kapp->dcopClient()->appId();
+ TQString appId=tdeApp->dcopClient()->appId();
TQString cwd_save = TQDir::currentDirPath();
if (!initial_cwd.isEmpty())
diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp
index 7b178c846..0fffd7538 100644
--- a/konsole/terminalhere/terminalhere.cpp
+++ b/konsole/terminalhere/terminalhere.cpp
@@ -32,7 +32,7 @@ TerminalHere::TerminalHere() : TDEApplication()
{
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("General");
TQString term = config->readPathEntry("TerminalApplication", "konsole");
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-19 12:24:36 +0000