summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/TEWidget.cpp4
-rw-r--r--konsole/konsole/konsole_part.cpp32
-rw-r--r--konsole/konsole/konsole_part.h6
-rw-r--r--konsole/konsole/main.cpp2
4 files changed, 22 insertions, 22 deletions
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 37dc4785a..3f47f962b 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -1184,8 +1184,8 @@ void TEWidget::propagateSize()
{
setSize(columns, lines);
TQFrame::setFixedSize(tqsizeHint());
- tqparentWidget()->adjustSize();
- tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint());
+ parentWidget()->adjustSize();
+ parentWidget()->setFixedSize(parentWidget()->tqsizeHint());
return;
}
if (image)
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index a2594edc1..3bf2daaee 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory()
s_aboutData = 0;
}
-KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
const TQStringList&)
{
-// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl;
- KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname);
+// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
+ KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
return obj;
}
@@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000
-konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
: KParts::ReadOnlyPart(parent, name)
,te(0)
,se(0)
@@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
,m_histSize(DEFAULT_HISTORY_SIZE)
,m_runningShell( false )
{
- tqparentWidget=_tqparentWidget;
+ parentWidget=_parentWidget;
setInstance(konsoleFactory::instance());
m_extension = new konsoleBrowserExtension(this);
@@ -137,7 +137,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb
const char* shell = getenv("SHELL");
if (shell == NULL || *shell == '\0') shell = "/bin/sh";
eargs.append(shell);
- te = new TEWidget(tqparentWidget,widgetName);
+ te = new TEWidget(parentWidget,widgetName);
te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget
setWidget(TQT_TQWIDGET(te));
@@ -317,13 +317,13 @@ void konsolePart::makeGUI()
if (!kapp->authorizeKAction("konsole_rmb"))
return;
- actions = new KActionCollection( (KMainWindow*)tqparentWidget );
- settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget );
+ actions = new KActionCollection( (KMainWindow*)parentWidget );
+ settingsActions = new KActionCollection( (KMainWindow*)parentWidget );
// Send Signal Menu -------------------------------------------------------------
if (kapp->authorizeKAction("send_signal"))
{
- m_signals = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_signals = new KPopupMenu((KMainWindow*)parentWidget);
m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP);
m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT);
m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP);
@@ -338,7 +338,7 @@ void konsolePart::makeGUI()
// Settings Menu ----------------------------------------------------------------
if (kapp->authorizeKAction("settings"))
{
- m_options = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_options = new KPopupMenu((KMainWindow*)parentWidget);
// Scrollbar
selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this,
@@ -379,7 +379,7 @@ void konsolePart::makeGUI()
// Keyboard Options Menu ---------------------------------------------------
if (kapp->authorizeKAction("keyboard"))
{
- m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_keytab = new KPopupMenu((KMainWindow*)parentWidget);
m_keytab->setCheckable(true);
connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
@@ -388,7 +388,7 @@ void konsolePart::makeGUI()
// Schema Options Menu -----------------------------------------------------
if (kapp->authorizeKAction("schema"))
{
- m_schema = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_schema = new KPopupMenu((KMainWindow*)parentWidget);
m_schema->setCheckable(true);
connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
@@ -452,7 +452,7 @@ void konsolePart::makeGUI()
}
// Popup Menu -------------------------------------------------------------------
- m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget);
+ m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget);
KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
@@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item)
void konsolePart::slotHistoryType()
{
if ( ! se ) return;
- HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget);
+ HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget);
if (dlg.exec()) {
if (dlg.isOn()) {
if (dlg.nbLines() > 0) {
@@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() {
bool ok;
TQString seps = KInputDialog::getText( i18n( "Word Connectors" ),
- i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget );
+ i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget );
if ( ok )
{
s_word_seps = seps;
@@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty )
void konsolePart::newSession()
{
if ( se ) delete se;
- se = new TESession(te, "xterm", tqparentWidget->winId());
+ se = new TESession(te, "xterm", parentWidget->winId());
connect( se,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)) );
connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index db7533178..1f65106ad 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -52,7 +52,7 @@ public:
konsoleFactory();
virtual ~konsoleFactory();
- virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+ virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
TQObject* parent = 0, const char* name = 0,
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
@@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{
Q_OBJECT
public:
- konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
+ konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
virtual ~konsolePart();
signals:
@@ -140,7 +140,7 @@ signals:
bool doWriteStream( const TQByteArray& );
bool doCloseStream();
- TQWidget* tqparentWidget;
+ TQWidget* parentWidget;
TEWidget* te;
TESession* se;
ColorSchemaList* colors;
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 9916ee82f..b5048f90a 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -650,7 +650,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
list->first();
while( list->current())
{
- if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) )
+ if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( TQt::WDestructiveClose ) )
{
list->remove();
continue;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 15:18:29 +0000