summaryrefslogtreecommitdiffstats
path: root/ksirc
diff options
context:
space:
mode:
Diffstat (limited to 'ksirc')
-rw-r--r--ksirc/FilterRuleEditor.cpp4
-rw-r--r--ksirc/FilterRuleEditor.h2
-rw-r--r--ksirc/KSOpenkSirc/enter_combo.h8
-rw-r--r--ksirc/KSOpenkSirc/open_ksirc.cpp4
-rw-r--r--ksirc/KSOpenkSirc/open_ksirc.h2
-rw-r--r--ksirc/KSPrefs/ksprefs.cpp4
-rw-r--r--ksirc/KSPrefs/ksprefs.h2
-rw-r--r--ksirc/KSPrefs/page_autoconnect.cpp32
-rw-r--r--ksirc/KSPrefs/page_autoconnect.h2
-rw-r--r--ksirc/KSPrefs/page_colors.cpp2
-rw-r--r--ksirc/KSPrefs/page_colors.h2
-rw-r--r--ksirc/KSPrefs/page_font.cpp4
-rw-r--r--ksirc/KSPrefs/page_font.h2
-rw-r--r--ksirc/KSPrefs/page_general.cpp2
-rw-r--r--ksirc/KSPrefs/page_general.h2
-rw-r--r--ksirc/KSPrefs/page_irccolors.cpp2
-rw-r--r--ksirc/KSPrefs/page_irccolors.h2
-rw-r--r--ksirc/KSPrefs/page_looknfeel.cpp2
-rw-r--r--ksirc/KSPrefs/page_looknfeel.h2
-rw-r--r--ksirc/KSPrefs/page_rmbmenu.cpp2
-rw-r--r--ksirc/KSPrefs/page_rmbmenu.h2
-rw-r--r--ksirc/KSPrefs/page_servchan.cpp2
-rw-r--r--ksirc/KSPrefs/page_servchan.h2
-rw-r--r--ksirc/KSPrefs/page_shortcuts.cpp2
-rw-r--r--ksirc/KSPrefs/page_shortcuts.h2
-rw-r--r--ksirc/KSPrefs/page_startup.cpp2
-rw-r--r--ksirc/KSPrefs/page_startup.h2
-rw-r--r--ksirc/KSProgress/ksprogress.cpp4
-rw-r--r--ksirc/KSProgress/ksprogress.h2
-rw-r--r--ksirc/KSProgress/ksprogressdata.cpp4
-rw-r--r--ksirc/KSProgress/ksprogressdata.h2
-rw-r--r--ksirc/KSTicker/ksticker.cpp4
-rw-r--r--ksirc/KSTicker/ksticker.h2
-rw-r--r--ksirc/KSTicker/speeddialog.cpp4
-rw-r--r--ksirc/KSTicker/speeddialog.h2
-rw-r--r--ksirc/KSTicker/speeddialogData.cpp4
-rw-r--r--ksirc/KSTicker/speeddialogData.h2
-rw-r--r--ksirc/NewWindowDialog.cpp4
-rw-r--r--ksirc/NewWindowDialog.h2
-rw-r--r--ksirc/ahistlineedit.cpp6
-rw-r--r--ksirc/ahistlineedit.h2
-rw-r--r--ksirc/alistbox.cpp4
-rw-r--r--ksirc/alistbox.h2
-rw-r--r--ksirc/chanButtons.cpp8
-rw-r--r--ksirc/chanButtons.h4
-rw-r--r--ksirc/chanparser.cpp2
-rw-r--r--ksirc/charSelector.cpp4
-rw-r--r--ksirc/charSelector.h2
-rw-r--r--ksirc/colorpicker.cpp8
-rw-r--r--ksirc/colorpicker.h4
-rw-r--r--ksirc/dccManager.cpp10
-rw-r--r--ksirc/dccManager.h2
-rw-r--r--ksirc/dccNew.cpp4
-rw-r--r--ksirc/dccNew.h2
-rw-r--r--ksirc/dccToplevel.cpp4
-rw-r--r--ksirc/dccToplevel.h2
-rw-r--r--ksirc/default.pl2
-rw-r--r--ksirc/dockservercontroller.cpp4
-rw-r--r--ksirc/dockservercontroller.h2
-rw-r--r--ksirc/ksirc.pl34
-rw-r--r--ksirc/ksircprocess.cpp8
-rw-r--r--ksirc/ksircprocess.h2
-rw-r--r--ksirc/kstextview.cpp4
-rw-r--r--ksirc/kstextview.h2
-rw-r--r--ksirc/ksview.cpp6
-rw-r--r--ksirc/ksview.h2
-rw-r--r--ksirc/mditoplevel.cpp4
-rw-r--r--ksirc/mditoplevel.h6
-rw-r--r--ksirc/puke/HOWTO-PUKE.pod22
-rw-r--r--ksirc/puke/commands.h12
-rw-r--r--ksirc/puke/controller.cpp22
-rw-r--r--ksirc/puke/controller.h4
-rw-r--r--ksirc/puke/palistbox.cpp10
-rw-r--r--ksirc/puke/palistbox.h2
-rw-r--r--ksirc/puke/pbase.pm14
-rw-r--r--ksirc/puke/pboxlayout.pm6
-rw-r--r--ksirc/puke/pbutton.cpp10
-rw-r--r--ksirc/puke/pbutton.h2
-rw-r--r--ksirc/puke/pframe.cpp12
-rw-r--r--ksirc/puke/pframe.h2
-rw-r--r--ksirc/puke/pkfiledialog.cpp8
-rw-r--r--ksirc/puke/pkfiledialog.h2
-rw-r--r--ksirc/puke/plabel.cpp10
-rw-r--r--ksirc/puke/plabel.h2
-rw-r--r--ksirc/puke/playout.cpp10
-rw-r--r--ksirc/puke/playout.h2
-rw-r--r--ksirc/puke/plined.cpp10
-rw-r--r--ksirc/puke/plined.h2
-rw-r--r--ksirc/puke/plistbox.cpp10
-rw-r--r--ksirc/puke/plistbox.h2
-rw-r--r--ksirc/puke/pmenudta.cpp2
-rw-r--r--ksirc/puke/pobject.cpp6
-rw-r--r--ksirc/puke/pobject.h6
-rw-r--r--ksirc/puke/pobjfinder.cpp6
-rw-r--r--ksirc/puke/pobjfinder.h2
-rw-r--r--ksirc/puke/ppopmenu.cpp10
-rw-r--r--ksirc/puke/pprogress.cpp10
-rw-r--r--ksirc/puke/pprogress.h2
-rw-r--r--ksirc/puke/ppushbt.cpp10
-rw-r--r--ksirc/puke/ppushbt.h2
-rw-r--r--ksirc/puke/ptabdialog.cpp6
-rw-r--r--ksirc/puke/ptabdialog.h2
-rw-r--r--ksirc/puke/ptablevw.cpp6
-rw-r--r--ksirc/puke/ptablevw.h2
-rw-r--r--ksirc/puke/pwidget.cpp10
-rw-r--r--ksirc/puke/pwidget.h2
-rw-r--r--ksirc/puke/pwidget.pm4
-rw-r--r--ksirc/servercontroller.cpp60
-rw-r--r--ksirc/servercontroller.h6
-rw-r--r--ksirc/ssfeprompt.cpp4
-rw-r--r--ksirc/ssfeprompt.h2
-rw-r--r--ksirc/ssfepromptdata.cpp4
-rw-r--r--ksirc/ssfepromptdata.h2
-rw-r--r--ksirc/topic.cpp8
-rw-r--r--ksirc/topic.h4
115 files changed, 317 insertions, 317 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index c9459864..76a6a2ef 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -23,10 +23,10 @@
FilterRuleEditor::FilterRuleEditor
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
- : KDialogBase( tqparent, name, true, i18n( "Edit Filter Rules" ),
+ : KDialogBase( parent, name, true, i18n( "Edit Filter Rules" ),
Close, Close, true )
{
filter = new FilterRuleWidget( this, name );
diff --git a/ksirc/FilterRuleEditor.h b/ksirc/FilterRuleEditor.h
index 1c3655b6..b4f2643e 100644
--- a/ksirc/FilterRuleEditor.h
+++ b/ksirc/FilterRuleEditor.h
@@ -25,7 +25,7 @@ public:
FilterRuleEditor
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/KSOpenkSirc/enter_combo.h b/ksirc/KSOpenkSirc/enter_combo.h
index bca46165..d708d005 100644
--- a/ksirc/KSOpenkSirc/enter_combo.h
+++ b/ksirc/KSOpenkSirc/enter_combo.h
@@ -12,12 +12,12 @@ class EnterCombo : public TQComboBox {
Q_OBJECT
TQ_OBJECT
public:
- EnterCombo ( TQWidget * tqparent=0, const char * name=0 )
- : TQComboBox(TRUE, tqparent, name)
+ EnterCombo ( TQWidget * parent=0, const char * name=0 )
+ : TQComboBox(TRUE, parent, name)
{
}
- EnterCombo ( bool rw, TQWidget * tqparent=0, const char * name=0 )
- : TQComboBox(rw, tqparent, name)
+ EnterCombo ( bool rw, TQWidget * parent=0, const char * name=0 )
+ : TQComboBox(rw, parent, name)
{
TQKeyEvent ke(TQEvent::KeyPress, SHIFT|Key_Home, 0, 0);
keyPressEvent(&ke);
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 9f9bebf8..b41373c5 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -35,11 +35,11 @@ TQPtrList<Server> Groups;
open_ksirc::open_ksirc
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- Inherited( tqparent, name, true )
+ Inherited( parent, name, true )
{
setCaption( i18n("Connect to Server") );
diff --git a/ksirc/KSOpenkSirc/open_ksirc.h b/ksirc/KSOpenkSirc/open_ksirc.h
index 238d6b84..1e923add 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.h
+++ b/ksirc/KSOpenkSirc/open_ksirc.h
@@ -25,7 +25,7 @@ public:
open_ksirc
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp
index 6deb550c..40ccc56f 100644
--- a/ksirc/KSPrefs/ksprefs.cpp
+++ b/ksirc/KSPrefs/ksprefs.cpp
@@ -26,10 +26,10 @@
#include "page_looknfeel.h"
#include "page_shortcuts.h"
-KSPrefs::KSPrefs(TQWidget * tqparent, const char * name):
+KSPrefs::KSPrefs(TQWidget * parent, const char * name):
KDialogBase(KDialogBase::IconList, i18n("Configure KSirc"),
KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
- KDialogBase::Ok, tqparent, name)
+ KDialogBase::Ok, parent, name)
{
setWFlags( getWFlags() | WDestructiveClose );
TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) );
diff --git a/ksirc/KSPrefs/ksprefs.h b/ksirc/KSPrefs/ksprefs.h
index 51ae6562..f09c058f 100644
--- a/ksirc/KSPrefs/ksprefs.h
+++ b/ksirc/KSPrefs/ksprefs.h
@@ -31,7 +31,7 @@ class KSPrefs : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- KSPrefs(TQWidget * tqparent = 0, const char * name = 0);
+ KSPrefs(TQWidget * parent = 0, const char * name = 0);
~KSPrefs();
public slots:
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 9a6e61ab..49920e42 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -26,7 +26,7 @@
#define PASS 2
#define SSL 3
-PageAutoConnect::PageAutoConnect( TQWidget *tqparent, const char *name ) : PageAutoConnectBase( tqparent, name)
+PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAutoConnectBase( parent, name)
{
KLVAutoConnect->setSorting( 0 );
//KLVAutoConnect->header()->hide();
@@ -170,25 +170,25 @@ void PageAutoConnect::add_pressed()
KLVAutoConnect->setCurrentItem(s);
}
else { /* update the existing one */
- TQListViewItem *tqparent;
+ TQListViewItem *parent;
TQListViewItem *child;
- if(s->tqparent()){
- tqparent = s->tqparent();
+ if(s->parent()){
+ parent = s->parent();
child = s;
}
else {
- tqparent = s;
+ parent = s;
child = 0x0;
}
- tqparent->setText(NAME, ServerLE->text());
- tqparent->setText(PK, TQString("%1").tqarg(PortKI->value()));
- tqparent->setText(PASS, PassLE->text());
+ parent->setText(NAME, ServerLE->text());
+ parent->setText(PK, TQString("%1").tqarg(PortKI->value()));
+ parent->setText(PASS, PassLE->text());
if(sslCB->isChecked())
- tqparent->setText(SSL, i18n("SSL"));
+ parent->setText(SSL, i18n("SSL"));
else
- tqparent->setText(SSL, TQString());
+ parent->setText(SSL, TQString());
if(child){
child->setText(NAME, ChannelLE->text());
@@ -197,7 +197,7 @@ void PageAutoConnect::add_pressed()
else {
if(ChannelLE->text().length() > 0){
fnd = 0;
- TQListViewItem *c = tqparent->firstChild();
+ TQListViewItem *c = parent->firstChild();
for( ; c != 0 && fnd == 0; c = c->nextSibling()){
if(c->text(NAME) == ChannelLE->text()){
c->setText(PK, KeyLE->text());
@@ -205,7 +205,7 @@ void PageAutoConnect::add_pressed()
}
}
if(fnd == 0){
- new TQListViewItem(tqparent, ChannelLE->text(), KeyLE->text());
+ new TQListViewItem(parent, ChannelLE->text(), KeyLE->text());
}
}
}
@@ -260,16 +260,16 @@ void PageAutoConnect::delete_pressed()
void PageAutoConnect::kvl_clicked(TQListViewItem *it)
{
if(it != 0){
- if(it->tqparent() != 0){
+ if(it->parent() != 0){
ChannelLE->setText(it->text(NAME));
KeyLE->setText(it->text(PK));
AddPB->setText(i18n("&Update"));
/*
- * Move it to the tqparent to setup tqparent/server
+ * Move it to the parent to setup parent/server
* values. This save writing this code
* in two places.
*/
- it = it->tqparent();
+ it = it->parent();
}
else {
AddPB->setText(i18n("&Update/Add"));
@@ -277,7 +277,7 @@ void PageAutoConnect::kvl_clicked(TQListViewItem *it)
KeyLE->clear();
}
- if(it->tqparent() == 0){
+ if(it->parent() == 0){
ServerLE->setText(it->text(NAME));
PortKI->setValue(it->text(PK).toInt());
PassLE->setText(it->text(PASS));
diff --git a/ksirc/KSPrefs/page_autoconnect.h b/ksirc/KSPrefs/page_autoconnect.h
index cce0f810..40cdfb5c 100644
--- a/ksirc/KSPrefs/page_autoconnect.h
+++ b/ksirc/KSPrefs/page_autoconnect.h
@@ -10,7 +10,7 @@ class PageAutoConnect : public PageAutoConnectBase
TQ_OBJECT
public:
- PageAutoConnect( TQWidget* tqparent = 0, const char* name = 0);
+ PageAutoConnect( TQWidget* parent = 0, const char* name = 0);
~PageAutoConnect();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index 0aca72ed..c6a3eb9e 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -19,7 +19,7 @@
#include <kcolorbutton.h>
#include <kdebug.h>
-PageColors::PageColors( TQWidget *tqparent, const char *name ) : PageColorsBase( tqparent, name)
+PageColors::PageColors( TQWidget *parent, const char *name ) : PageColorsBase( parent, name)
{
changing = 0;
m_dcol.setAutoDelete(true);
diff --git a/ksirc/KSPrefs/page_colors.h b/ksirc/KSPrefs/page_colors.h
index 4b2313e4..2211dbc2 100644
--- a/ksirc/KSPrefs/page_colors.h
+++ b/ksirc/KSPrefs/page_colors.h
@@ -23,7 +23,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageColors( TQWidget *tqparent = 0, const char *name = 0 );
+ PageColors( TQWidget *parent = 0, const char *name = 0 );
~PageColors();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp
index d10f8925..d320a3f5 100644
--- a/ksirc/KSPrefs/page_font.cpp
+++ b/ksirc/KSPrefs/page_font.cpp
@@ -1,7 +1,7 @@
#include "page_font.h"
#include "tqapplication.h"
-PageFont::PageFont( TQWidget *tqparent, const char *name ) :
- TQWidget( tqparent, name)
+PageFont::PageFont( TQWidget *parent, const char *name ) :
+ TQWidget( parent, name)
{
tqlayout = new TQHBoxLayout(this);
fontchooser = new KFontChooser(this);
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index d07babad..fcda96f2 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -18,7 +18,7 @@ class PageFont : public TQWidget
/**
* Create the Widget
*/
- PageFont( TQWidget *tqparent = 0, const char *name = 0 );
+ PageFont( TQWidget *parent = 0, const char *name = 0 );
/*
diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp
index f90016a5..51a78ec3 100644
--- a/ksirc/KSPrefs/page_general.cpp
+++ b/ksirc/KSPrefs/page_general.cpp
@@ -15,7 +15,7 @@
#include "page_general.h"
#include "../servercontroller.h"
-PageGeneral::PageGeneral( TQWidget *tqparent, const char *name ) : PageGeneralBase( tqparent, name)
+PageGeneral::PageGeneral( TQWidget *parent, const char *name ) : PageGeneralBase( parent, name)
{
}
diff --git a/ksirc/KSPrefs/page_general.h b/ksirc/KSPrefs/page_general.h
index e7e3227c..fb33f7d4 100644
--- a/ksirc/KSPrefs/page_general.h
+++ b/ksirc/KSPrefs/page_general.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageGeneral( TQWidget *tqparent = 0, const char *name = 0 );
+ PageGeneral( TQWidget *parent = 0, const char *name = 0 );
~PageGeneral();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_irccolors.cpp b/ksirc/KSPrefs/page_irccolors.cpp
index 5177dc49..5ed96054 100644
--- a/ksirc/KSPrefs/page_irccolors.cpp
+++ b/ksirc/KSPrefs/page_irccolors.cpp
@@ -14,7 +14,7 @@
#include <kconfig.h>
#include <kcolorbutton.h>
-PageIRCColors::PageIRCColors( TQWidget *tqparent, const char *name ) : PageIRCColorsBase( tqparent, name)
+PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name)
{
}
diff --git a/ksirc/KSPrefs/page_irccolors.h b/ksirc/KSPrefs/page_irccolors.h
index 843a8391..3d8a25b8 100644
--- a/ksirc/KSPrefs/page_irccolors.h
+++ b/ksirc/KSPrefs/page_irccolors.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageIRCColors( TQWidget *tqparent = 0, const char *name = 0 );
+ PageIRCColors( TQWidget *parent = 0, const char *name = 0 );
~PageIRCColors();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp
index f29523b8..29608e04 100644
--- a/ksirc/KSPrefs/page_looknfeel.cpp
+++ b/ksirc/KSPrefs/page_looknfeel.cpp
@@ -16,7 +16,7 @@
#include <kfiledialog.h>
#include "page_looknfeel.h"
-PageLooknFeel::PageLooknFeel( TQWidget *tqparent, const char *name ) : PageLooknFeelBase( tqparent, name)
+PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name)
{
modePreview->setPixmap(TQPixmap(locate("data","ksirc/pics/sdi.png")));
wallpaperPathLE->fileDialog()->setFilter( "*.jpg *.png *.gif" );
diff --git a/ksirc/KSPrefs/page_looknfeel.h b/ksirc/KSPrefs/page_looknfeel.h
index cc9d0f08..58c9427b 100644
--- a/ksirc/KSPrefs/page_looknfeel.h
+++ b/ksirc/KSPrefs/page_looknfeel.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageLooknFeel( TQWidget *tqparent = 0, const char *name = 0 );
+ PageLooknFeel( TQWidget *parent = 0, const char *name = 0 );
~PageLooknFeel();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp
index c6bb24ee..de30a829 100644
--- a/ksirc/KSPrefs/page_rmbmenu.cpp
+++ b/ksirc/KSPrefs/page_rmbmenu.cpp
@@ -20,7 +20,7 @@
-PageRMBMenu::PageRMBMenu( TQWidget *tqparent, const char *name ) : PageRMBMenuBase( tqparent, name)
+PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase( parent, name)
{
UserControlMenu *ucm;
diff --git a/ksirc/KSPrefs/page_rmbmenu.h b/ksirc/KSPrefs/page_rmbmenu.h
index 39b8cd89..a32e0b27 100644
--- a/ksirc/KSPrefs/page_rmbmenu.h
+++ b/ksirc/KSPrefs/page_rmbmenu.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageRMBMenu( TQWidget *tqparent = 0, const char *name = 0 );
+ PageRMBMenu( TQWidget *parent = 0, const char *name = 0 );
~PageRMBMenu();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index e1ed6413..f7587947 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -15,7 +15,7 @@
#include <kapplication.h>
#include <kconfig.h>
-PageServChan::PageServChan( TQWidget *tqparent, const char *name ) : PageServChanBase( tqparent, name)
+PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
{
connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL()));
connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL()));
diff --git a/ksirc/KSPrefs/page_servchan.h b/ksirc/KSPrefs/page_servchan.h
index 8db7d223..44efdc5c 100644
--- a/ksirc/KSPrefs/page_servchan.h
+++ b/ksirc/KSPrefs/page_servchan.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageServChan( TQWidget *tqparent = 0, const char *name = 0 );
+ PageServChan( TQWidget *parent = 0, const char *name = 0 );
~PageServChan();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp
index ab30824a..6dce178b 100644
--- a/ksirc/KSPrefs/page_shortcuts.cpp
+++ b/ksirc/KSPrefs/page_shortcuts.cpp
@@ -16,7 +16,7 @@
#include "page_shortcuts.h"
#include "../servercontroller.h"
-PageShortcuts::PageShortcuts( TQWidget *tqparent, const char *name ) : PageShortcutsBase( tqparent, name)
+PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcutsBase( parent, name)
{
globalGB->setColumnLayout( 0, Qt::Horizontal );
diff --git a/ksirc/KSPrefs/page_shortcuts.h b/ksirc/KSPrefs/page_shortcuts.h
index c551db9b..d6d54088 100644
--- a/ksirc/KSPrefs/page_shortcuts.h
+++ b/ksirc/KSPrefs/page_shortcuts.h
@@ -21,7 +21,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageShortcuts( TQWidget *tqparent = 0, const char *name = 0 );
+ PageShortcuts( TQWidget *parent = 0, const char *name = 0 );
~PageShortcuts();
void saveConfig();
diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp
index 60e3402f..e2ddfdc1 100644
--- a/ksirc/KSPrefs/page_startup.cpp
+++ b/ksirc/KSPrefs/page_startup.cpp
@@ -19,7 +19,7 @@
#include "page_startup.h"
-PageStartup::PageStartup( TQWidget *tqparent, const char *name ) : PageStartupBase( tqparent, name)
+PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase( parent, name)
{
notifyLB->upButton()->hide();
notifyLB->downButton()->hide();
diff --git a/ksirc/KSPrefs/page_startup.h b/ksirc/KSPrefs/page_startup.h
index ab905770..a12399ff 100644
--- a/ksirc/KSPrefs/page_startup.h
+++ b/ksirc/KSPrefs/page_startup.h
@@ -19,7 +19,7 @@ Q_OBJECT
TQ_OBJECT
public:
- PageStartup( TQWidget *tqparent = 0, const char *name = 0 );
+ PageStartup( TQWidget *parent = 0, const char *name = 0 );
~PageStartup();
void saveConfig();
diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp
index d299f22a..361c171c 100644
--- a/ksirc/KSProgress/ksprogress.cpp
+++ b/ksirc/KSProgress/ksprogress.cpp
@@ -10,11 +10,11 @@
KSProgress::KSProgress
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- Inherited( tqparent, name )
+ Inherited( parent, name )
{
setCaption("KSProgress");
id = "";
diff --git a/ksirc/KSProgress/ksprogress.h b/ksirc/KSProgress/ksprogress.h
index 91f915c5..cee92836 100644
--- a/ksirc/KSProgress/ksprogress.h
+++ b/ksirc/KSProgress/ksprogress.h
@@ -21,7 +21,7 @@ public:
KSProgress
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp
index 5abbc735..88180c66 100644
--- a/ksirc/KSProgress/ksprogressdata.cpp
+++ b/ksirc/KSProgress/ksprogressdata.cpp
@@ -22,11 +22,11 @@
ksprogressData::ksprogressData
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- Inherited( tqparent, name, 0 )
+ Inherited( parent, name, 0 )
{
progress = new KProgress( this, "User_1" );
progress->setGeometry( 10, 60, 230, 20 );
diff --git a/ksirc/KSProgress/ksprogressdata.h b/ksirc/KSProgress/ksprogressdata.h
index afd3b15e..0bffb520 100644
--- a/ksirc/KSProgress/ksprogressdata.h
+++ b/ksirc/KSProgress/ksprogressdata.h
@@ -26,7 +26,7 @@ public:
ksprogressData
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index d2f5d228..7394d3fb 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -21,8 +21,8 @@
#include <kwin.h>
#include <kdebug.h>
-KSTicker::KSTicker(TQWidget * tqparent, const char * name, WFlags f)
-: TQFrame(tqparent, name, f)
+KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
+: TQFrame(parent, name, f)
{
pHeight = 1;
diff --git a/ksirc/KSTicker/ksticker.h b/ksirc/KSTicker/ksticker.h
index 0ded7da9..1001ea75 100644
--- a/ksirc/KSTicker/ksticker.h
+++ b/ksirc/KSTicker/ksticker.h
@@ -18,7 +18,7 @@ class KSTicker : public TQFrame
TQ_OBJECT
public:
- KSTicker(TQWidget * tqparent=0, const char * name=0, WFlags f=0);
+ KSTicker(TQWidget * parent=0, const char * name=0, WFlags f=0);
virtual ~KSTicker();
void setString(TQString);
diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp
index e9597ace..1abc8059 100644
--- a/ksirc/KSTicker/speeddialog.cpp
+++ b/ksirc/KSTicker/speeddialog.cpp
@@ -15,10 +15,10 @@ SpeedDialog::SpeedDialog
(
int tick,
int step,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
- : speeddialogData( tqparent, name )
+ : speeddialogData( parent, name )
{
setCaption(i18n( "Speed Setup") );
connect(sliderTick, TQT_SIGNAL(valueChanged(int)),
diff --git a/ksirc/KSTicker/speeddialog.h b/ksirc/KSTicker/speeddialog.h
index c5ade254..1da157cf 100644
--- a/ksirc/KSTicker/speeddialog.h
+++ b/ksirc/KSTicker/speeddialog.h
@@ -23,7 +23,7 @@ public:
(
int tick,
int step,
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp
index ddb733df..04102569 100644
--- a/ksirc/KSTicker/speeddialogData.cpp
+++ b/ksirc/KSTicker/speeddialogData.cpp
@@ -19,8 +19,8 @@
#include <tqlayout.h>
#include <kdialog.h>
-speeddialogData::speeddialogData ( TQWidget* tqparent, const char* name )
- :TQDialog( tqparent, name, 0 )
+speeddialogData::speeddialogData ( TQWidget* parent, const char* name )
+ :TQDialog( parent, name, 0 )
{
TQGridLayout *grid = new TQGridLayout( this, 3, 2 , KDialog::marginHint(), KDialog::spacingHint());
sliderTick = new TQSlider( this, "Slider_1" );
diff --git a/ksirc/KSTicker/speeddialogData.h b/ksirc/KSTicker/speeddialogData.h
index 31dd21da..1d871690 100644
--- a/ksirc/KSTicker/speeddialogData.h
+++ b/ksirc/KSTicker/speeddialogData.h
@@ -26,7 +26,7 @@ public:
speeddialogData
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index aa0bccf7..1a0f2dba 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -8,8 +8,8 @@
#include <klineedit.h>
#include "NewWindowDialog.h"
-NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * tqparent, const char * name)
- : KDialogBase(tqparent, name, true, i18n("New Window For"), Ok|Cancel, Ok, true),
+NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * parent, const char * name)
+ : KDialogBase(parent, name, true, i18n("New Window For"), Ok|Cancel, Ok, true),
m_channelInfo(channelInfo)
{
TQHBox * w = makeHBoxMainWidget();
diff --git a/ksirc/NewWindowDialog.h b/ksirc/NewWindowDialog.h
index 5f541d83..ce8b956c 100644
--- a/ksirc/NewWindowDialog.h
+++ b/ksirc/NewWindowDialog.h
@@ -15,7 +15,7 @@ class NewWindowDialog : public KDialogBase
public:
- NewWindowDialog(const KSircChannel &, TQWidget * tqparent = 0, const char * name = 0);
+ NewWindowDialog(const KSircChannel &, TQWidget * parent = 0, const char * name = 0);
~NewWindowDialog();
protected slots:
diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp
index 2baa2381..4928155c 100644
--- a/ksirc/ahistlineedit.cpp
+++ b/ksirc/ahistlineedit.cpp
@@ -55,8 +55,8 @@
#include <kshortcut.h>
-aHistLineEdit::aHistLineEdit(TQWidget *tqparent, const char *name)
- : TQTextEdit(tqparent, name)
+aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name)
+ : TQTextEdit(parent, name)
{
m_drawrect = false;
@@ -304,7 +304,7 @@ bool aHistLineEdit::processKeyEvent( TQKeyEvent *e )
/*
* Only put key sequences in here you
* want us to ignore and to pass upto
- * tqparent widgets for handling
+ * parent widgets for handling
*/
bool eat = false;
diff --git a/ksirc/ahistlineedit.h b/ksirc/ahistlineedit.h
index e66a634a..c25508d8 100644
--- a/ksirc/ahistlineedit.h
+++ b/ksirc/ahistlineedit.h
@@ -10,7 +10,7 @@ class aHistLineEdit : public TQTextEdit
Q_OBJECT
TQ_OBJECT
public:
- aHistLineEdit(TQWidget *tqparent = 0, const char *name = 0);
+ aHistLineEdit(TQWidget *parent = 0, const char *name = 0);
int cursorPosition () const;
void setCursorPosition(int);
diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp
index ca0609e8..60e27cdf 100644
--- a/ksirc/alistbox.cpp
+++ b/ksirc/alistbox.cpp
@@ -23,8 +23,8 @@
#include <kglobal.h>
#include <kurldrag.h>
-aListBox::aListBox(TQWidget *tqparent, const char *name )
- : TQListBox(tqparent,name)
+aListBox::aListBox(TQWidget *parent, const char *name )
+ : TQListBox(parent,name)
{
clear();
p_scroll = TQPalette(tqpalette());
diff --git a/ksirc/alistbox.h b/ksirc/alistbox.h
index d254c3ab..244a2fcb 100644
--- a/ksirc/alistbox.h
+++ b/ksirc/alistbox.h
@@ -53,7 +53,7 @@ class aListBox : public TQListBox
TQ_OBJECT
public:
- aListBox(TQWidget *tqparent = 0, const char *name = 0);
+ aListBox(TQWidget *parent = 0, const char *name = 0);
virtual ~aListBox();
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index fecfc068..d5f59939 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -22,8 +22,8 @@ static void makeSquare(TQWidget *w)
w->setFixedSize(s,s);
}
-chanButtons::chanButtons(KSircProcess *proc, TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name),
+chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name)
+: TQWidget(parent, name),
m_proc(proc)
{
Popupmenu = new KPopupMenu( this );
@@ -203,8 +203,8 @@ void chanButtons::setMenuItemMode(int id, bool value)
Popupmenu->setItemChecked(toggleMenu[id], value);
}
-chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *tqparent,
- const char *name, bool modal) : KDialog(tqparent, name, modal)
+chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent,
+ const char *name, bool modal) : KDialog(parent, name, modal)
{
m_sendKey = "";
m_sendLimitedUsers = 0;
diff --git a/ksirc/chanButtons.h b/ksirc/chanButtons.h
index 092a9afd..ec5ebe9d 100644
--- a/ksirc/chanButtons.h
+++ b/ksirc/chanButtons.h
@@ -22,7 +22,7 @@ class chanButtons : public TQWidget
TQ_OBJECT
friend class KSircTopLevel;
public:
- chanButtons(KSircProcess *proc, TQWidget* tqparent=0, const char* name=0);
+ chanButtons(KSircProcess *proc, TQWidget* parent=0, const char* name=0);
~chanButtons() {};
void setProtectMode(bool value) { protectButton->setOn(value); }
@@ -65,7 +65,7 @@ class chanbuttonsDialog : public KDialog
friend class chanButtons;
public:
enum type { limited, key };
- chanbuttonsDialog(const type &modeType, TQWidget *tqparent=0, const char *name=0, bool modal=true);
+ chanbuttonsDialog(const type &modeType, TQWidget *parent=0, const char *name=0, bool modal=true);
~chanbuttonsDialog() {};
private slots:
diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index ece0864e..b2bdc93c 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -819,7 +819,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
}
case 'o': // Op, arg is the nick
case 'v': // Voice, arg is the nick
- case 'b': // Ban, arg is tqmask banned
+ case 'b': // Ban, arg is mask banned
case 'k': // kcik, arg is nick
if(ai == NULL)
return new parseError(i18n("Unable to parse mode change: %1").tqarg(string), TQString());
diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp
index 49f5a364..30364565 100644
--- a/ksirc/charSelector.cpp
+++ b/ksirc/charSelector.cpp
@@ -8,8 +8,8 @@
#include <klocale.h>
-charSelector::charSelector(TQWidget *tqparent, const char* name)
- : KDialog(tqparent, name, false)
+charSelector::charSelector(TQWidget *parent, const char* name)
+ : KDialog(parent, name, false)
{
testLayout = new TQVBoxLayout(this);
testLayout->setSpacing( spacingHint() );
diff --git a/ksirc/charSelector.h b/ksirc/charSelector.h
index 8c69b2a8..2a2052c5 100644
--- a/ksirc/charSelector.h
+++ b/ksirc/charSelector.h
@@ -15,7 +15,7 @@ class charSelector : public KDialog
Q_OBJECT
TQ_OBJECT
public:
- charSelector(TQWidget *tqparent=0, const char *name=0);
+ charSelector(TQWidget *parent=0, const char *name=0);
~charSelector();
virtual bool eventFilter ( TQObject * watched, TQEvent * e );
diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index c16c8048..be5fca73 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -30,8 +30,8 @@
#include <klocale.h>
-ColorPicker::ColorPicker( TQWidget *tqparent, const char *name )
- : KDialogBase( tqparent, name, true /*modal*/, i18n( "Pick Color" ),
+ColorPicker::ColorPicker( TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, true /*modal*/, i18n( "Pick Color" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Cancel ),
m_foregroundColor( -1 ), m_backgroundColor( -1 )
@@ -130,9 +130,9 @@ void ColorPicker::updateSample()
m_sample->setPalette( TQPalette( cg, cg, cg ) );
}
-ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *tqparent,
+ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent,
const char *name )
- : TQFrame( tqparent, name, WStaticContents | WRepaintNoErase ),
+ : TQFrame( parent, name, WStaticContents | WRepaintNoErase ),
m_currentCell( -1 ), m_focusedCell( - 1 ), m_colors( colors ),
m_cellSize( 0 )
{
diff --git a/ksirc/colorpicker.h b/ksirc/colorpicker.h
index 3e7bf452..4decce34 100644
--- a/ksirc/colorpicker.h
+++ b/ksirc/colorpicker.h
@@ -31,7 +31,7 @@ class ColorPicker : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ColorPicker( TQWidget *tqparent, const char *name = 0 );
+ ColorPicker( TQWidget *parent, const char *name = 0 );
TQString colorString() const;
@@ -52,7 +52,7 @@ class ColorBar : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- ColorBar( const TQValueVector<TQColor> &colors, TQWidget *tqparent, const char *name = 0 );
+ ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent, const char *name = 0 );
signals:
void colorPicked( int col );
diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp
index f0b65126..cbf63109 100644
--- a/ksirc/dccManager.cpp
+++ b/ksirc/dccManager.cpp
@@ -22,8 +22,8 @@
#define COL_CPS 4
#define COL_PER 5
-dccItem::dccItem( KListView *tqparent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size )
- : TQObject(), KListViewItem(tqparent), m_who(who), m_file(file), m_type(type)
+dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size )
+ : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type)
{
m_percent = 0;
m_status = status;
@@ -43,8 +43,8 @@ dccItem::dccItem( KListView *tqparent, dccManager *manager, enum dccType type, c
}
-dccItem::dccItem( KListViewItem *tqparent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size )
-: TQObject(), KListViewItem(tqparent), m_who(who), m_file(file), m_type(type)
+dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size )
+: TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type)
{
m_percent = 0;
m_status = status;
@@ -199,7 +199,7 @@ void dccItem::cancelRename(int col)
}
}
-dccManager::dccManager( TQWidget *tqparent, const char *name ) : dccManagerbase( tqparent, name)
+dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( parent, name)
{
dccNewDialog = 0x0;
diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h
index 7eb7822b..ec5b9bbe 100644
--- a/ksirc/dccManager.h
+++ b/ksirc/dccManager.h
@@ -99,7 +99,7 @@ Q_OBJECT
TQ_OBJECT
public:
- dccManager( TQWidget *tqparent = 0, const char *name = 0 );
+ dccManager( TQWidget *parent = 0, const char *name = 0 );
~dccManager();
dccItem *newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus, unsigned int size);
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 74fdd56e..871c044d 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -27,8 +27,8 @@
#include "dccNew.h"
#include "objFinder.h"
-dccNew::dccNew( TQWidget *tqparent, const char *name, int type, TQString nick )
- : dccNewBase( tqparent, name)
+dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
+ : dccNewBase( parent, name)
{
TQColorGroup cg_mainw = kapp->tqpalette().active();
diff --git a/ksirc/dccNew.h b/ksirc/dccNew.h
index 3f4a5a54..e86e7163 100644
--- a/ksirc/dccNew.h
+++ b/ksirc/dccNew.h
@@ -17,7 +17,7 @@ Q_OBJECT
TQ_OBJECT
public:
- dccNew( TQWidget *tqparent = 0,
+ dccNew( TQWidget *parent = 0,
const char *name = 0,
int type = -1,
TQString nick = TQString() );
diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp
index 4d4d32a6..86d07d5e 100644
--- a/ksirc/dccToplevel.cpp
+++ b/ksirc/dccToplevel.cpp
@@ -15,8 +15,8 @@ extern DisplayMgr *displayMgr;
#define DTL_WINDOW_ID 10
-dccTopLevel::dccTopLevel(TQWidget *tqparent, const char *name)
- : KMainWindow(tqparent, name, TQt::WDestructiveClose)
+dccTopLevel::dccTopLevel(TQWidget *parent, const char *name)
+ : KMainWindow(parent, name, TQt::WDestructiveClose)
{
m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager");
// m_mgr->show();
diff --git a/ksirc/dccToplevel.h b/ksirc/dccToplevel.h
index 33e129f6..a87f4498 100644
--- a/ksirc/dccToplevel.h
+++ b/ksirc/dccToplevel.h
@@ -13,7 +13,7 @@ Q_OBJECT
TQ_OBJECT
public:
- dccTopLevel(TQWidget *tqparent = 0, const char *name = 0);
+ dccTopLevel(TQWidget *parent = 0, const char *name = 0);
virtual ~dccTopLevel();
dccManager *mgr() { return m_mgr; }
diff --git a/ksirc/default.pl b/ksirc/default.pl
index 392204aa..7b42dd18 100644
--- a/ksirc/default.pl
+++ b/ksirc/default.pl
@@ -427,7 +427,7 @@ sub cmd_fk {
$n0thing_channel=$talkchannel;
$n0thing_kickpat=$newarg;
&slashify($n0thing_kickpat);
- $n0thing_kickmsg=$args || "though names may change each face retains the tqmask it wore";
+ $n0thing_kickmsg=$args || "though names may change each face retains the mask it wore";
&addhook("352", "dofklist");
&addhook("315", "donefk");
&sl("WHO $talkchannel");
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index 4c553df6..e47d98da 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -53,8 +53,8 @@ dscNickInfo::~dscNickInfo()
}
-dockServerController::dockServerController(servercontroller *sc, TQWidget *tqparent, const char *_name)
-: KSystemTray(tqparent, _name),
+dockServerController::dockServerController(servercontroller *sc, TQWidget *parent, const char *_name)
+: KSystemTray(parent, _name),
m_sc(sc)
{
diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h
index 4083c044..51020fdd 100644
--- a/ksirc/dockservercontroller.h
+++ b/ksirc/dockservercontroller.h
@@ -53,7 +53,7 @@ class dockServerController : public KSystemTray
Q_OBJECT
TQ_OBJECT
public:
- dockServerController(servercontroller *_sc, TQWidget *tqparent = 0x0, const char *_name = 0x0);
+ dockServerController(servercontroller *_sc, TQWidget *parent = 0x0, const char *_name = 0x0);
~dockServerController();
void startBlink(const TQString& reason = TQString(), const TQString& text = TQString());
diff --git a/ksirc/ksirc.pl b/ksirc/ksirc.pl
index 5d925a59..a1768f63 100644
--- a/ksirc/ksirc.pl
+++ b/ksirc/ksirc.pl
@@ -13,8 +13,8 @@ is used. Port and password are optional.");
"\cbAdded by KSirc.pl\cb
Usage: BAN <nickname>
bans the specified user on the current channel. Only channel operators
-can use this command. Bans the user in the form *!*user\@hosttqmask.
-hosttqmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise
+can use this command. Bans the user in the form *!*user\@hostmask.
+hostmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise
it is *.domain.com
See Also: UNBAN, CLRBAN, BANLIST");
@@ -126,8 +126,8 @@ sub cmd_banlist {
sub hook_banlist {
$silent = 1;
- my (undef, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]);
- &print("~!default~*** \cb$tqmask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb");
+ my (undef, $channel, $mask, $banner, $time) = split(/ +/, $_[0]);
+ &print("~!default~*** \cb$mask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb");
}
sub hook_rmbanlist {
@@ -168,8 +168,8 @@ sub cmd_clrban {
sub hook_tban {
$silent = 1;
- my ($shit, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]);
- push @bans, $tqmask;
+ my ($shit, $channel, $mask, $banner, $time) = split(/ +/, $_[0]);
+ push @bans, $mask;
if (@bans == 6) {
&print("mode $channel -bbbbbb @bans");
@bans = ();
@@ -193,14 +193,14 @@ sub hook_disconnectd {
#&addhook("kick","kickd");
sub cmd_fcmd {
- ($names,$tqmask,$command) = split(/ /, $args,3);
- $tqmask =~ s/\!/\!/;
- $tqmask =~ s/\@/\@/;
- $tqmask =~ s/\./\\./g;
- $tqmask =~ s/\*/.*/g;
+ ($names,$mask,$command) = split(/ /, $args,3);
+ $mask =~ s/\!/\!/;
+ $mask =~ s/\@/\@/;
+ $mask =~ s/\./\\./g;
+ $mask =~ s/\*/.*/g;
&addhook("353","filtercommand");
&addhook("366","removefiltercommand");
- &tell("\t\cb~4Matching /$tqmask/i on $names...");
+ &tell("\t\cb~4Matching /$mask/i on $names...");
&docommand("names $names");
}
&addcmd("fcmd");
@@ -217,8 +217,8 @@ sub hook_filtercommand {
sub dofilter {
$s = "$who\!$user\@$host";
- #&tell("$s =~ /$tqmask/");
- if ($s =~ /$tqmask/i) {
+ #&tell("$s =~ /$mask/");
+ if ($s =~ /$mask/i) {
$d = $command;
$d =~ s/\$1/$who/;
&docommand($d);
@@ -228,12 +228,12 @@ sub dofilter {
sub hook_removefiltercommand {
&remhook("353","filtercommand");
&remhook("366","removefiltercommand");
- &tell("*\cbI\cb* Filter on $names, /$tqmask/i, Done.");
+ &tell("*\cbI\cb* Filter on $names, /$mask/i, Done.");
}
sub cmd_fc {
- my ($tqmask, $cmd) = split(/ /, $args, 2);
- &docommand("fcmd $talkchannel $tqmask $cmd");
+ my ($mask, $cmd) = split(/ /, $args, 2);
+ &docommand("fcmd $talkchannel $mask $cmd");
}
&addcmd("fc");
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 3c07d8ad..2aa02e63 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -11,10 +11,10 @@
Interface:
public:
- KSircProcess(*server=0L, *tqparent=0, *name=0)
+ KSircProcess(*server=0L, *parent=0, *name=0)
server: is the name of the server to connect to. It must be
provided or else start sirc will barf. :(
- tqparent: tqparent window, this _should_ be null
+ parent: parent window, this _should_ be null
name: name, passed to TQObject...
~KSirProcess:
@@ -117,8 +117,8 @@
extern DisplayMgr *displayMgr;
-KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * tqparent, const char * name )
- : TQObject(tqparent, name), m_kss(kss), m_serverid(server_id)
+KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * parent, const char * name )
+ : TQObject(parent, name), m_kss(kss), m_serverid(server_id)
{
proc = new KProcess();
diff --git a/ksirc/ksircprocess.h b/ksirc/ksircprocess.h
index 97c3ab88..a89a66d5 100644
--- a/ksirc/ksircprocess.h
+++ b/ksirc/ksircprocess.h
@@ -22,7 +22,7 @@ class KSircProcess : public TQObject
TQ_OBJECT
friend class KSircIOController;
public:
- KSircProcess(TQString &server_id, KSircServer &kss, TQObject * tqparent=0, const char * name=0);
+ KSircProcess(TQString &server_id, KSircServer &kss, TQObject * parent=0, const char * name=0);
virtual ~KSircProcess();
TQDict<KSircMessageReceiver> &getWindowList()
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 1ad22239..bd43d82c 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -1613,8 +1613,8 @@ void ContentsPaintAlgorithm::paint()
}
}
-TextView::TextView( TQWidget *tqparent, const char *name )
- : TQScrollView( tqparent, name, WRepaintNoErase ),
+TextView::TextView( TQWidget *parent, const char *name )
+ : TQScrollView( parent, name, WRepaintNoErase ),
m_paintBuffer( PaintBufferExtend, PaintBufferExtend ),
m_selectionEndBeforeStart( false ), m_mousePressed( false ),
m_mmbPressed( false ),
diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h
index e033c0a0..6b3813a8 100644
--- a/ksirc/kstextview.h
+++ b/ksirc/kstextview.h
@@ -473,7 +473,7 @@ class TextView : public TQScrollView
friend class TextParag;
friend class TextParagIterator;
public:
- TextView( TQWidget *tqparent, const char *name = 0 );
+ TextView( TQWidget *parent, const char *name = 0 );
virtual ~TextView();
virtual void clear();
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 8ad1ffd3..4fb90d9b 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -42,8 +42,8 @@
#include "nickColourMaker.h"
#include "ksircprocess.h"
-KSircView::KSircView(KSircProcess *proc, TQWidget *tqparent, const char *name)
- : KSirc::TextView(tqparent, name), m_proc(proc)
+KSircView::KSircView(KSircProcess *proc, TQWidget *parent, const char *name)
+ : KSirc::TextView(parent, name), m_proc(proc)
{
m_acceptFiles = false;
m_timestamps = false;
@@ -84,7 +84,7 @@ void KSircView::saveURL( const TQString &url )
{
KURL kurl( url );
- KFileDialog *dlg = new KFileDialog( TQString(), TQString() /*filter*/, this /*tqparent*/, "filedialog" /*name*/, true /*modal*/ );
+ KFileDialog *dlg = new KFileDialog( TQString(), TQString() /*filter*/, this /*parent*/, "filedialog" /*name*/, true /*modal*/ );
dlg->setKeepLocation( true );
diff --git a/ksirc/ksview.h b/ksirc/ksview.h
index aa79118d..60fa0f45 100644
--- a/ksirc/ksview.h
+++ b/ksirc/ksview.h
@@ -30,7 +30,7 @@ class KSircView : public KSirc::TextView
Q_OBJECT
TQ_OBJECT
public:
- KSircView(KSircProcess *proc, TQWidget *tqparent, const char *name);
+ KSircView(KSircProcess *proc, TQWidget *parent, const char *name);
virtual ~KSircView();
virtual void clear();
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index ffe0bb4c..5dac79ad 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -29,8 +29,8 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e)
}
}
-MDITopLevel::MDITopLevel(TQWidget *tqparent, const char *name)
- : KMainWindow(tqparent, name)
+MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
+ : KMainWindow(parent, name)
{
m_closing = false;
diff --git a/ksirc/mditoplevel.h b/ksirc/mditoplevel.h
index c24186d2..ce1321a7 100644
--- a/ksirc/mditoplevel.h
+++ b/ksirc/mditoplevel.h
@@ -11,8 +11,8 @@ class KSTabWidget : public TQTabWidget
Q_OBJECT
TQ_OBJECT
public:
- KSTabWidget ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
- : TQTabWidget(tqparent, name, f)
+ KSTabWidget ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
+ : TQTabWidget(parent, name, f)
{
}
@@ -32,7 +32,7 @@ class MDITopLevel : public KMainWindow
Q_OBJECT
TQ_OBJECT
public:
- MDITopLevel(TQWidget *tqparent = 0, const char *name = 0);
+ MDITopLevel(TQWidget *parent = 0, const char *name = 0);
virtual ~MDITopLevel();
void addWidget( TQWidget *widget, bool show );
diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 2a6bc799..600f2111 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -67,7 +67,7 @@ supporting perl5-oop object.
=head2 2.1 C++ Widget code
The C++ code must be able to hand all required settings and messages
-for the widget. Each new widget iherites it's tqparent and so forth
+for the widget. Each new widget iherites it's parent and so forth
allowing for a nice oop tqlayout. The widget structure the author is
following is the same as Qt's. Their seems to work well, why
re-invent the wheel?
@@ -117,27 +117,27 @@ destroyed.
createWidget is defined as:
-PWidget *createWidget(widgetId *pwi, PWidget *tqparent);
+PWidget *createWidget(widgetId *pwi, PWidget *parent);
It is called everytime a new widget of yours is required. The
widgetId will be the identifier for your widget and must be kept for
all future commands. PWidget::setWidgetId(pwi) should be called to
-set the widget id. The *tqparent is the tqparent of the current widget.
+set the widget id. The *parent is the parent of the current widget.
Generally PWidget->widget() is passed to the contructor of your
-widget. If it's 0, there is no tqparent. Simeplfied code for a the
+widget. If it's 0, there is no parent. Simeplfied code for a the
PFrame is:
=begin text
extern "C" {
-PWidget *createWidget(widgetId *pwi, PWIdget *tqparent);
+PWidget *createWidget(widgetId *pwi, PWIdget *parent);
}
-PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){
+PWidget *createWidget(widgetId *pwi, PWIdget *parent){
QFrame *f;
- PFrame *pf = new PFrame(tqparent);
- if(tqparent != 0){
- f = new QFrame(tqparent->widget());
+ PFrame *pf = new PFrame(parent);
+ if(parent != 0){
+ f = new QFrame(parent->widget());
}
else{
f = new QPFrame();
@@ -149,13 +149,13 @@ PWidget *createWidget(widgetId *pwi, PWIdget *tqparent){
=end text
-Note: you have to check tqparent for null since calling NULL->widget()
+Note: you have to check parent for null since calling NULL->widget()
results in Bad Things (tm).
=item 2.1.3 messageHandler
This receives all commands, etc. It should process required commands,
-if a command is unkown pass it to the tqparent. PFrame example:
+if a command is unkown pass it to the parent. PFrame example:
=begin text
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index 8a8158e0..2baa316e 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -66,7 +66,7 @@
// Fetch widgets
-// Desc: get widget from tqparent
+// Desc: get widget from parent
// iWinId: not defined
// iArg: not defined
// cArg: 2 feilds, tab sperated, must be returned unchanged. 1. random string. 3. Object Name.
@@ -82,7 +82,7 @@
// Widget commands starts at 1000 and end at 10000
// Desc: create new widget
-// iWinId: tqparent widget id
+// iWinId: parent widget id
// iArg: widget type as defined by PWIDGET_*
// cArg: Must be return unchanged
#define PUKE_WIDGET_CREATE 1000
@@ -335,13 +335,13 @@
// cArg: not defined
#define PUKE_WIDGET_SET_ENABLED_ACK -1090
-// Desc: recreate widget with new tqparent, etc
+// Desc: recreate widget with new parent, etc
// IwinId: window id
-// iArg: window ID for new tqparent, 0x0 for no tqparent, toplevel
+// iArg: window ID for new parent, 0x0 for no parent, toplevel
// cArg: 3 packed ints, 0 = x, 1 = y, 2 = showit
#define PUKE_WIDGET_RECREATE 1091
-// Desc: ACK recreate widget with new tqparent, etc
+// Desc: ACK recreate widget with new parent, etc
// IwinId: window id
// iArg: 0 (for all ok, other for error)
// cArg: 0
@@ -996,7 +996,7 @@
// Group tqlayout commands exist between 10000 and 11000
// Desc: create new box tqlayout
-// iWinId: PWidget tqparent
+// iWinId: PWidget parent
// iArg: 2 shorts, short[0] direction, short[1] border
// cArg: random character string
#define PUKE_LAYOUT_NEW 11000
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 771a5676..20c020c7 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -50,7 +50,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
uint PukeController::uiBaseWinId = 10; // Gives a little seperation from the controller id
-PukeController::PukeController(TQString sock, TQObject *tqparent, const char *name) : PObject( tqparent, name )
+PukeController::PukeController(TQString sock, TQObject *parent, const char *name) : PObject( parent, name )
{
int len, prev_umask;
struct sockaddr_un unix_addr;
@@ -562,7 +562,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
widgetId wIret;
/*
- * The tqparent widget ID and type are packed into the iArg
+ * The parent widget ID and type are packed into the iArg
* the pattern is 2 shorts.
*/
@@ -580,14 +580,14 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm)
wIret.iWinId = uiBaseWinId;
wIret.fd = fd;
- // CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
+ // CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
CreateArgs arg(this, pm, &wIret, 0);
// Let's go looking for the widget
// Match any class with the right name
TQObject *obj = 0x0;
- if(tqparent() && (strcmp(name, tqparent()->name()) == 0)){
- obj = tqparent();
+ if(parent() && (strcmp(name, parent()->name()) == 0)){
+ obj = parent();
}
else {
obj = objFinder::find(name, 0x0);
@@ -915,11 +915,11 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) {
widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
{
widgetId wIret;
- PWidget *tqparent = 0; // Defaults to no tqparent
+ PWidget *parent = 0; // Defaults to no parent
WidgetS *ws = new WidgetS;
/*
- * The tqparent widget ID and type are packed into the iArg
+ * The parent widget ID and type are packed into the iArg
* the pattern is 2 shorts.
*/
@@ -928,7 +928,7 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
if(found != 2)
throw(errorCommandFailed(PUKE_INVALID,7));
- wI.iWinId = iParent; // wI is the identifier for the tqparent widget
+ wI.iWinId = iParent; // wI is the identifier for the parent widget
if(widgetCF[iType] == NULL){ // No such widget, bail out.
wIret.fd = 0;
@@ -947,11 +947,11 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm)
if(obj->widget()->isWidgetType() == FALSE){
throw(errorCommandFailed(PUKE_INVALID, 0));
}
- tqparent = (PWidget *) obj;
+ parent = (PWidget *) obj;
}
- // CreateArgs arg = CreateArgs(this, pm, &wIret, tqparent)
- CreateArgs arg(this, pm, &wIret, tqparent);
+ // CreateArgs arg = CreateArgs(this, pm, &wIret, parent)
+ CreateArgs arg(this, pm, &wIret, parent);
ws->pwidget = (widgetCF[iType]->wc)(arg);
if (ws->pwidget->hasError())
{
diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h
index 5d22cef3..92c8be98 100644
--- a/ksirc/puke/controller.h
+++ b/ksirc/puke/controller.h
@@ -82,7 +82,7 @@ class PukeController : public PObject
Q_OBJECT
TQ_OBJECT
public:
- PukeController(TQString socket = "", TQObject *tqparent=0, const char *name=0);
+ PukeController(TQString socket = "", TQObject *parent=0, const char *name=0);
virtual ~PukeController();
bool running;
@@ -169,7 +169,7 @@ private:
/**
* Create new Widget, returns new iWinId for it.
- * Takes server fd and tqparent winid, and type as arguments
+ * Takes server fd and parent winid, and type as arguments
*/
widgetId createWidget(widgetId wI, PukeMessage *pm);
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 211cbf91..05124441 100644
--- a/ksirc/puke/palistbox.cpp
+++ b/ksirc/puke/palistbox.cpp
@@ -6,14 +6,14 @@
PObject *
PAListBox::createWidget(CreateArgs &ca)
{
- PAListBox *plb = new PAListBox(ca.tqparent);
+ PAListBox *plb = new PAListBox(ca.parent);
aListBox *lb;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("aListBox") == TRUE){
lb = (aListBox *) ca.fetchedObj;
plb->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- lb = new aListBox((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ lb = new aListBox((TQWidget *) ca.parent->widget());
else
lb = new aListBox();
plb->setWidget(lb);
@@ -22,8 +22,8 @@ PAListBox::createWidget(CreateArgs &ca)
}
-PAListBox::PAListBox(PObject *tqparent)
- : PListBox(tqparent)
+PAListBox::PAListBox(PObject *parent)
+ : PListBox(parent)
{
// kdDebug(5008) << "PListBox PListBox called" << endl;
lb = 0;
diff --git a/ksirc/puke/palistbox.h b/ksirc/puke/palistbox.h
index 5c50023e..d7731685 100644
--- a/ksirc/puke/palistbox.h
+++ b/ksirc/puke/palistbox.h
@@ -15,7 +15,7 @@ class PAListBox : public PListBox
public:
static PObject *createWidget(CreateArgs &ca);
- PAListBox ( PObject * tqparent );
+ PAListBox ( PObject * parent );
virtual ~PAListBox ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pbase.pm b/ksirc/puke/pbase.pm
index b5b13be7..b8345cdb 100644
--- a/ksirc/puke/pbase.pm
+++ b/ksirc/puke/pbase.pm
@@ -40,19 +40,19 @@ sub rndchr {
sub new {
my $class = shift;
- my $tqparent = $_[$#_];
+ my $parent = $_[$#_];
my $self = {};
-# print "Parent: $tqparent\n";
+# print "Parent: $parent\n";
bless($self, $class);
- $tqparent = 0 if($tqparent == undef);
+ $parent = 0 if($parent == undef);
$self->{iWinId} = -1;
- $self->{Parent} = $tqparent if $tqparent != 0;
+ $self->{Parent} = $parent if $parent != 0;
$self->{initId} = $self->rndchr();
$self->{widgetType} = $PBase::NO_WIDGET;
$self->{cmdQueue} = ();
@@ -77,13 +77,13 @@ sub create {
return;
}
- my $tqparent = $self->{Parent} ? $self->{Parent}->{iWinId} : 0;
+ my $parent = $self->{Parent} ? $self->{Parent}->{iWinId} : 0;
- # print "*I* Createing widget of type: " . $self->{widgetType} . " with tqparent " . $tqparent . "\n";
+ # print "*I* Createing widget of type: " . $self->{widgetType} . " with parent " . $parent . "\n";
$self->{runable} = 1;
- my $carg = $tqparent . "\t" . $self->{widgetType} . "\t" . $self->{initId};
+ my $carg = $parent . "\t" . $self->{widgetType} . "\t" . $self->{initId};
my %REPLY = $self->sendMessage('iCommand' => $::PUKE_WIDGET_CREATE,
'iWinId' => $::PUKE_CONTROLLER,
diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm
index 22087b5f..9896fd1c 100644
--- a/ksirc/puke/pboxlayout.pm
+++ b/ksirc/puke/pboxlayout.pm
@@ -28,7 +28,7 @@ sub new {
# print "Widget: " . ref($widget) . "\n";
# if(ref($widget) eq ''){
- # print "*E* Error Creating PBoxLayout, did not give valid tqparent\n";
+ # print "*E* Error Creating PBoxLayout, did not give valid parent\n";
# return;
#}
# elsif(ref($widget) eq 'PBoxLayout'){
@@ -99,7 +99,7 @@ sub addWidget {
my $align = shift;
if($self->{Added} == 0){
- print "*E* Burp: Can't add widget without first being added to tqparent tqlayout\n";
+ print "*E* Burp: Can't add widget without first being added to parent tqlayout\n";
return;
}
@@ -128,7 +128,7 @@ sub addLayout {
my $self = shift;
if($self->{Added} == 0){
- print "*E* Burp: Can't add tqlayout without first being added to tqparent tqlayout\n";
+ print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n";
}
diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp
index 828b7f2f..f21cdf03 100644
--- a/ksirc/puke/pbutton.cpp
+++ b/ksirc/puke/pbutton.cpp
@@ -10,10 +10,10 @@
PObject *
PButton::createWidget(CreateArgs &ca)
{
- PButton *pb = new PButton(ca.tqparent);
+ PButton *pb = new PButton(ca.parent);
TQButton *qb;
- if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- qb = new TQButton((TQWidget *) ca.tqparent->widget());
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ qb = new TQButton((TQWidget *) ca.parent->widget());
else
qb = new TQButton();
pb->setWidget(qb);
@@ -22,8 +22,8 @@ PButton::createWidget(CreateArgs &ca)
}
-PButton::PButton(PObject *tqparent)
- : PWidget(tqparent)
+PButton::PButton(PObject *parent)
+ : PWidget(parent)
{
// kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
button = 0;
diff --git a/ksirc/puke/pbutton.h b/ksirc/puke/pbutton.h
index 2ee1fb1f..20546c8b 100644
--- a/ksirc/puke/pbutton.h
+++ b/ksirc/puke/pbutton.h
@@ -17,7 +17,7 @@ class PButton : public PWidget
public:
static PObject *createWidget(CreateArgs &ca);
- PButton ( PObject * tqparent );
+ PButton ( PObject * parent );
virtual ~PButton ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pframe.cpp b/ksirc/puke/pframe.cpp
index 6acad37e..11d504c5 100644
--- a/ksirc/puke/pframe.cpp
+++ b/ksirc/puke/pframe.cpp
@@ -4,11 +4,11 @@
PObject *
PFrame::createWidget(CreateArgs &ca)
{
- PFrame *pw = new PFrame(ca.tqparent);
+ PFrame *pw = new PFrame(ca.parent);
TQFrame *tf;
- if(ca.tqparent != 0 &&
- ca.tqparent->widget()->isWidgetType() == TRUE)
- tf = new TQFrame((TQWidget *) ca.tqparent->widget());
+ if(ca.parent != 0 &&
+ ca.parent->widget()->isWidgetType() == TRUE)
+ tf = new TQFrame((TQWidget *) ca.parent->widget());
else
tf = new TQFrame();
pw->setWidget(tf);
@@ -18,8 +18,8 @@ PFrame::createWidget(CreateArgs &ca)
}
-PFrame::PFrame( PObject *tqparent)
- : PWidget(tqparent)
+PFrame::PFrame( PObject *parent)
+ : PWidget(parent)
{
// kdDebug(5008) << "PFrame PFrame called" << endl;
frame = 0;
diff --git a/ksirc/puke/pframe.h b/ksirc/puke/pframe.h
index 0405f99b..65a2ec29 100644
--- a/ksirc/puke/pframe.h
+++ b/ksirc/puke/pframe.h
@@ -14,7 +14,7 @@ class PFrame : public PWidget
public:
static PObject *createWidget(CreateArgs &ca);
- PFrame ( PObject * tqparent );
+ PFrame ( PObject * parent );
virtual ~PFrame ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pkfiledialog.cpp b/ksirc/puke/pkfiledialog.cpp
index 255ed2b8..53d37aa7 100644
--- a/ksirc/puke/pkfiledialog.cpp
+++ b/ksirc/puke/pkfiledialog.cpp
@@ -9,13 +9,13 @@
PObject *
PKFileDialog::createWidget(CreateArgs &ca)
{
- PKFileDialog *pw = new PKFileDialog(ca.tqparent);
+ PKFileDialog *pw = new PKFileDialog(ca.parent);
KFileDialog *kfbd;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits("KFileDialog") == TRUE){
kfbd = (KFileDialog *) ca.fetchedObj;
pw->setDeleteAble(FALSE);
}
- else // Never takes a tqparent in Puke
+ else // Never takes a parent in Puke
kfbd = new KFileDialog("/", TQString(), 0L, "PukeKFileDialog", TRUE);
pw->setWidget(kfbd);
pw->setWidgetId(ca.pwI);
@@ -23,8 +23,8 @@ PKFileDialog::createWidget(CreateArgs &ca)
}
-PKFileDialog::PKFileDialog(PObject *tqparent)
- : PWidget(tqparent)
+PKFileDialog::PKFileDialog(PObject *parent)
+ : PWidget(parent)
{
kfbd = 0;
setWidget(kfbd);
diff --git a/ksirc/puke/pkfiledialog.h b/ksirc/puke/pkfiledialog.h
index 5b5802bb..274f1997 100644
--- a/ksirc/puke/pkfiledialog.h
+++ b/ksirc/puke/pkfiledialog.h
@@ -15,7 +15,7 @@ class PKFileDialog : public PWidget
public:
static PObject *createWidget(CreateArgs &ca);
- PKFileDialog ( PObject * tqparent );
+ PKFileDialog ( PObject * parent );
virtual ~PKFileDialog ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp
index 2c313e3a..41a68636 100644
--- a/ksirc/puke/plabel.cpp
+++ b/ksirc/puke/plabel.cpp
@@ -8,14 +8,14 @@
PObject *
PLabel::createWidget(CreateArgs &ca)
{
- PLabel *pw = new PLabel(ca.tqparent);
+ PLabel *pw = new PLabel(ca.parent);
TQLabel *le;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLABEL_OBJECT_NAME_STRING) == TRUE){
le = (TQLabel *) ca.fetchedObj;
pw->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- le = new TQLabel((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ le = new TQLabel((TQWidget *) ca.parent->widget());
else
le = new TQLabel((TQWidget *)0L);
pw->setWidget(le);
@@ -24,8 +24,8 @@ PLabel::createWidget(CreateArgs &ca)
}
-PLabel::PLabel(PObject *tqparent)
- : PFrame(tqparent)
+PLabel::PLabel(PObject *parent)
+ : PFrame(parent)
{
// kdDebug(5008) << "PLabel PLabel called" << endl;
label = 0;
diff --git a/ksirc/puke/plabel.h b/ksirc/puke/plabel.h
index 8fd0bceb..57a50b68 100644
--- a/ksirc/puke/plabel.h
+++ b/ksirc/puke/plabel.h
@@ -15,7 +15,7 @@ class PLabel : public PFrame
public:
static PObject *createWidget(CreateArgs &ca);
- PLabel ( PObject * tqparent );
+ PLabel ( PObject * parent );
virtual ~PLabel ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index e3242a81..3dbe5c87 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -23,7 +23,7 @@ PLayout::~PLayout()
PObject *PLayout::createWidget(CreateArgs &ca)
{
- PLayout *pw = new PLayout(ca.tqparent);
+ PLayout *pw = new PLayout(ca.parent);
TQBoxLayout *qbl;
int direction, border, iType, iParent;
// Retreive the border and direction information out of the
@@ -31,10 +31,10 @@ PObject *PLayout::createWidget(CreateArgs &ca)
if(sscanf(ca.pm->cArg, "%d\t%d\t%d\t%d", &iParent, &iType, &direction, &border) < 4)
throw(errorCommandFailed(-ca.pm->iCommand, -1));
- if((ca.tqparent != 0) &&
- (ca.tqparent->widget()->isWidgetType() == TRUE)){
- qbl = new TQBoxLayout((TQWidget *) ca.tqparent->widget(), (TQBoxLayout::Direction) direction, border);
- // kdDebug(5008) << "Creating tqlayout with tqparent: " << tqparent.iWinId << endl;
+ if((ca.parent != 0) &&
+ (ca.parent->widget()->isWidgetType() == TRUE)){
+ qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
+ // kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl;
}
else{
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 45f1975c..4124cb14 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -15,7 +15,7 @@ class PLayout : public PObject
public:
static PObject *createWidget(CreateArgs &ca);
- PLayout(TQObject *tqparent = 0);
+ PLayout(TQObject *parent = 0);
virtual ~PLayout();
/**
diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp
index 0b50ee5f..250edc13 100644
--- a/ksirc/puke/plined.cpp
+++ b/ksirc/puke/plined.cpp
@@ -8,10 +8,10 @@
PObject *
PLineEdit::createWidget(CreateArgs &ca)
{
- PLineEdit *pw = new PLineEdit(ca.tqparent);
+ PLineEdit *pw = new PLineEdit(ca.parent);
TQLineEdit *le;
- if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- le = new TQLineEdit((TQWidget *) ca.tqparent->widget());
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ le = new TQLineEdit((TQWidget *) ca.parent->widget());
else
le = new TQLineEdit(0L);
pw->setWidget(le);
@@ -20,8 +20,8 @@ PLineEdit::createWidget(CreateArgs &ca)
}
-PLineEdit::PLineEdit(PObject *tqparent)
- : PWidget(tqparent)
+PLineEdit::PLineEdit(PObject *parent)
+ : PWidget(parent)
{
// kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
lineedit = 0;
diff --git a/ksirc/puke/plined.h b/ksirc/puke/plined.h
index 6bcd3bb3..ed86640d 100644
--- a/ksirc/puke/plined.h
+++ b/ksirc/puke/plined.h
@@ -15,7 +15,7 @@ class PLineEdit : public PWidget
public:
static PObject *createWidget(CreateArgs &ca);
- PLineEdit ( PObject * tqparent );
+ PLineEdit ( PObject * parent );
virtual ~PLineEdit ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp
index 6766d58a..c244f81b 100644
--- a/ksirc/puke/plistbox.cpp
+++ b/ksirc/puke/plistbox.cpp
@@ -6,14 +6,14 @@
PObject *
PListBox::createWidget(CreateArgs &ca)
{
- PListBox *plb = new PListBox(ca.tqparent);
+ PListBox *plb = new PListBox(ca.parent);
TQListBox *lb;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQLISTBOX_OBJECT_NAME_STRING) == TRUE){
lb = (TQListBox *) ca.fetchedObj;
plb->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- lb = new TQListBox((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ lb = new TQListBox((TQWidget *) ca.parent->widget());
else
lb = new TQListBox();
plb->setWidget(lb);
@@ -22,8 +22,8 @@ PListBox::createWidget(CreateArgs &ca)
}
-PListBox::PListBox(PObject *tqparent)
- : PFrame(tqparent)
+PListBox::PListBox(PObject *parent)
+ : PFrame(parent)
{
// kdDebug(5008) << "PListBox PListBox called" << endl;
lb = 0;
diff --git a/ksirc/puke/plistbox.h b/ksirc/puke/plistbox.h
index f2e1c191..e130fdd3 100644
--- a/ksirc/puke/plistbox.h
+++ b/ksirc/puke/plistbox.h
@@ -15,7 +15,7 @@ class PListBox : public PFrame
public:
static PObject *createWidget(CreateArgs &ca);
- PListBox ( PObject * tqparent );
+ PListBox ( PObject * parent );
virtual ~PListBox ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp
index 7ca4ddee..576ebc39 100644
--- a/ksirc/puke/pmenudta.cpp
+++ b/ksirc/puke/pmenudta.cpp
@@ -13,7 +13,7 @@ PMenuData::PMenuData(PObject *_child)
PMenuData::~PMenuData()
{
- // We don't nuke anything since we're kind of abstract and we let the tqparent take care of it
+ // We don't nuke anything since we're kind of abstract and we let the parent take care of it
}
void PMenuData::messageHandler(int , PukeMessage *)
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index f1457302..ab729315 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -23,10 +23,10 @@ PObject::~PObject()
PObject *PObject::createWidget(CreateArgs &ca)
{
- PObject *pw = new PObject(ca.tqparent);
+ PObject *pw = new PObject(ca.parent);
TQObject *o;
- if(ca.tqparent != 0)
- o = new TQObject(ca.tqparent->widget());
+ if(ca.parent != 0)
+ o = new TQObject(ca.parent->widget());
else
o = new TQObject();
pw->setWidget(o);
diff --git a/ksirc/puke/pobject.h b/ksirc/puke/pobject.h
index ef1589b3..757a33d4 100644
--- a/ksirc/puke/pobject.h
+++ b/ksirc/puke/pobject.h
@@ -14,13 +14,13 @@ public:
CreateArgs(PukeController *_pc, PukeMessage *_pm, widgetId *_pwI, PObject *_parent){
pc = _pc;
pwI = _pwI;
- tqparent = _parent;
+ parent = _parent;
pm = _pm;
fetchedObj = 0;
}
PukeController *pc;
widgetId *pwI;
- PObject *tqparent;
+ PObject *parent;
PukeMessage *pm;
/**
@@ -34,7 +34,7 @@ class PObject : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- PObject(TQObject *tqparent = 0, const char *name = 0);
+ PObject(TQObject *parent = 0, const char *name = 0);
virtual ~PObject();
/**
diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp
index c8ca6557..6870e142 100644
--- a/ksirc/puke/pobjfinder.cpp
+++ b/ksirc/puke/pobjfinder.cpp
@@ -5,7 +5,7 @@
PObject *
PObjFinder::createWidget(CreateArgs &ca)
{
- PObjFinder *pw = new PObjFinder(ca.tqparent);
+ PObjFinder *pw = new PObjFinder(ca.parent);
pw->setWidget(0x0);
pw->setWidgetId(ca.pwI);
pw->setPukeController(ca.pc);
@@ -13,8 +13,8 @@ PObjFinder::createWidget(CreateArgs &ca)
}
-PObjFinder::PObjFinder(PObject *tqparent)
- : PObject(tqparent)
+PObjFinder::PObjFinder(PObject *parent)
+ : PObject(parent)
{
// We don't actually encase a widget since all the ObjFinder interface
// is static
diff --git a/ksirc/puke/pobjfinder.h b/ksirc/puke/pobjfinder.h
index 8eac2424..e2bfd76e 100644
--- a/ksirc/puke/pobjfinder.h
+++ b/ksirc/puke/pobjfinder.h
@@ -14,7 +14,7 @@ class PObjFinder : public PObject
public:
static PObject *createWidget(CreateArgs &ca);
- PObjFinder ( PObject * tqparent );
+ PObjFinder ( PObject * parent );
virtual ~PObjFinder ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp
index 225aa203..3ed66aa3 100644
--- a/ksirc/puke/ppopmenu.cpp
+++ b/ksirc/puke/ppopmenu.cpp
@@ -6,14 +6,14 @@
PObject *
PPopupMenu::createWidget(CreateArgs &ca)
{
- PPopupMenu *pm = new PPopupMenu(ca.tqparent);
+ PPopupMenu *pm = new PPopupMenu(ca.parent);
TQPopupMenu *qpm;
if(ca.fetchedObj != 0 && ca.fetchedObj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) == TRUE){
qpm= (TQPopupMenu *) ca.fetchedObj;
pm->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- qpm = new TQPopupMenu((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ qpm = new TQPopupMenu((TQWidget *) ca.parent->widget());
else
qpm = new TQPopupMenu();
pm->setWidget(qpm);
@@ -22,8 +22,8 @@ PPopupMenu::createWidget(CreateArgs &ca)
}
-PPopupMenu::PPopupMenu(PObject *tqparent)
- : PFrame(tqparent)
+PPopupMenu::PPopupMenu(PObject *parent)
+ : PFrame(parent)
{
// kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
menu = 0;
diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp
index 41838bca..09ed39d2 100644
--- a/ksirc/puke/pprogress.cpp
+++ b/ksirc/puke/pprogress.cpp
@@ -8,10 +8,10 @@
PObject *
PProgress::createWidget(CreateArgs &ca)
{
- PProgress *pw = new PProgress(ca.tqparent);
+ PProgress *pw = new PProgress(ca.parent);
KSProgress *ksp;
- if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- ksp = new KSProgress((TQWidget *) ca.tqparent->widget());
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ ksp = new KSProgress((TQWidget *) ca.parent->widget());
else
ksp = new KSProgress();
pw->setWidget(ksp);
@@ -20,8 +20,8 @@ PProgress::createWidget(CreateArgs &ca)
}
-PProgress::PProgress( PObject *tqparent)
- : PWidget(tqparent)
+PProgress::PProgress( PObject *parent)
+ : PWidget(parent)
{
// kdDebug(5008) << "PProgress PProgress called" << endl;
ksp = 0;
diff --git a/ksirc/puke/pprogress.h b/ksirc/puke/pprogress.h
index f88023c2..509c184d 100644
--- a/ksirc/puke/pprogress.h
+++ b/ksirc/puke/pprogress.h
@@ -15,7 +15,7 @@ class PProgress : public PWidget {
public:
static PObject *createWidget(CreateArgs &ca);
- PProgress ( PObject * tqparent = 0);
+ PProgress ( PObject * parent = 0);
virtual ~PProgress ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ppushbt.cpp b/ksirc/puke/ppushbt.cpp
index cf61d642..f006fbd2 100644
--- a/ksirc/puke/ppushbt.cpp
+++ b/ksirc/puke/ppushbt.cpp
@@ -5,10 +5,10 @@
PObject *
PPushButton::createWidget(CreateArgs &ca)
{
- PPushButton *pb = new PPushButton(ca.tqparent);
+ PPushButton *pb = new PPushButton(ca.parent);
TQPushButton *qb;
- if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- qb = new TQPushButton((TQWidget *) ca.tqparent->widget());
+ if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ qb = new TQPushButton((TQWidget *) ca.parent->widget());
else
qb = new TQPushButton(0L);
pb->setWidget(qb);
@@ -17,8 +17,8 @@ PPushButton::createWidget(CreateArgs &ca)
}
-PPushButton::PPushButton(PObject *tqparent)
- : PButton(tqparent)
+PPushButton::PPushButton(PObject *parent)
+ : PButton(parent)
{
// kdDebug(5008) << "PLineEdit PLineEdit called" << endl;
button = 0;
diff --git a/ksirc/puke/ppushbt.h b/ksirc/puke/ppushbt.h
index e887afb8..dc9e0a40 100644
--- a/ksirc/puke/ppushbt.h
+++ b/ksirc/puke/ppushbt.h
@@ -16,7 +16,7 @@ class PPushButton : public PButton
public:
static PObject *createWidget(CreateArgs &ca);
- PPushButton ( PObject * tqparent );
+ PPushButton ( PObject * parent );
virtual ~PPushButton ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp
index cd25f64a..30bc3e0a 100644
--- a/ksirc/puke/ptabdialog.cpp
+++ b/ksirc/puke/ptabdialog.cpp
@@ -8,7 +8,7 @@
PObject *
PTabDialog::createWidget(CreateArgs &ca)
{
- PTabDialog *ptd = new PTabDialog(ca.tqparent);
+ PTabDialog *ptd = new PTabDialog(ca.parent);
TQTabDialog *qtd;
// Retreive the border and direction information out of the
// carg string
@@ -16,8 +16,8 @@ PTabDialog::createWidget(CreateArgs &ca)
qtd = (TQTabDialog *) ca.fetchedObj;
ptd->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- qtd = new TQTabDialog((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ qtd = new TQTabDialog((TQWidget *) ca.parent->widget());
else
qtd = new TQTabDialog();
ptd->setWidget(qtd);
diff --git a/ksirc/puke/ptabdialog.h b/ksirc/puke/ptabdialog.h
index 0e4c9b94..a603d684 100644
--- a/ksirc/puke/ptabdialog.h
+++ b/ksirc/puke/ptabdialog.h
@@ -14,7 +14,7 @@ class PTabDialog : public PWidget
public:
static PObject *createWidget(CreateArgs &ca);
- PTabDialog(TQObject *tqparent = 0);
+ PTabDialog(TQObject *parent = 0);
virtual ~PTabDialog();
/**
diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp
index 3c77eeab..64c8fa2e 100644
--- a/ksirc/puke/ptablevw.cpp
+++ b/ksirc/puke/ptablevw.cpp
@@ -5,15 +5,15 @@ PObject *
PTableView::createWidget(CreateArgs &ca)
{
qWarning("Table View is abstract class, cannot create an object from it!!!");
- PTableView *pt = new PTableView(ca.tqparent);
+ PTableView *pt = new PTableView(ca.parent);
pt->setWidget(0);
pt->setWidgetId(ca.pwI);
return pt;
}
-PTableView::PTableView(PObject *tqparent)
- : PFrame(tqparent)
+PTableView::PTableView(PObject *parent)
+ : PFrame(parent)
{
// kdDebug(5008) << "PTableView PTableView called" << endl;
tbl = 0;
diff --git a/ksirc/puke/ptablevw.h b/ksirc/puke/ptablevw.h
index 1974aec4..89469407 100644
--- a/ksirc/puke/ptablevw.h
+++ b/ksirc/puke/ptablevw.h
@@ -17,7 +17,7 @@ class PTableView : public PFrame
public:
static PObject *createWidget(CreateArgs &ca);
- PTableView ( PObject * tqparent );
+ PTableView ( PObject * parent );
virtual ~PTableView ();
virtual void messageHandler(int fd, PukeMessage *pm);
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index 20507b55..cf3ac667 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -59,8 +59,8 @@ PObject *PWidget::createWidget(CreateArgs &ca)
tw = (TQWidget *) ca.fetchedObj;
pw->setDeleteAble(FALSE);
}
- else if(ca.tqparent != 0 && ca.tqparent->widget()->isWidgetType() == TRUE)
- tw = new TQWidget((TQWidget *) ca.tqparent->widget());
+ else if(ca.parent != 0 && ca.parent->widget()->isWidgetType() == TRUE)
+ tw = new TQWidget((TQWidget *) ca.parent->widget());
else
tw = new TQWidget();
pw->setWidget(tw);
@@ -236,12 +236,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
break;
case PUKE_WIDGET_RECREATE:
{
- TQWidget *ntqparent = 0x0;
+ TQWidget *nparent = 0x0;
if(pm->iArg != 0x0){
widgetId wiWidget;
wiWidget.fd = fd;
wiWidget.iWinId = pm->iArg;
- ntqparent = controller()->id2pwidget(&wiWidget)->widget();
+ nparent = controller()->id2pwidget(&wiWidget)->widget();
}
if(pm->iTextSize != 3*sizeof(int)){
throw(errorCommandFailed(pm->iCommand, pm->iArg));
@@ -250,7 +250,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
qWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]);
- widget()->reparent(ntqparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]);
+ widget()->reparent(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]);
pmRet.iCommand = PUKE_WIDGET_RECREATE_ACK;
pmRet.iWinId = pm->iWinId;
diff --git a/ksirc/puke/pwidget.h b/ksirc/puke/pwidget.h
index 294203b2..bc8fb4e9 100644
--- a/ksirc/puke/pwidget.h
+++ b/ksirc/puke/pwidget.h
@@ -13,7 +13,7 @@ class PWidget : public PObject
Q_OBJECT
TQ_OBJECT
public:
- PWidget(PObject *tqparent = 0);
+ PWidget(PObject *parent = 0);
virtual ~PWidget();
// Init and setup code
diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm
index b0f1c014..56381db6 100644
--- a/ksirc/puke/pwidget.pm
+++ b/ksirc/puke/pwidget.pm
@@ -216,11 +216,11 @@ sub setEnabled {
sub recreate {
my $self = shift;
- my $ntqparent = shift;
+ my $nparent = shift;
my $wflags = shift; # Not used!
$self->sendMessage('iCommand' => $::PUKE_WIDGET_RECREATE,
- 'iArg' => $ntqparent ? $ntqparent->{'iWinId'} : 0,
+ 'iArg' => $nparent ? $nparent->{'iWinId'} : 0,
'cArg' => pack("iii", shift(), shift(), shift()),
'CallBack' => sub {});
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 1f4e62d7..9b3121d0 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -20,23 +20,23 @@
Creates a new sirc process and window !default connected to the
server. Does nothing if a server connection already exists.
- add_toplevel(TQString tqparent, TQString child):
+ add_toplevel(TQString parent, TQString child):
Args:
- tqparent: the server name that the new channel is being joined on
+ parent: the server name that the new channel is being joined on
child: the new channel name
Action:
Adds "child" to the list of joined channles in the main
window. Always call this on new window creation!
- delete_toplevel(TQString tqparent, TQString child):
+ delete_toplevel(TQString parent, TQString child):
Args:
- tqparent: the server name of which channel is closing
- child: the channle that is closing. IFF Emtpy, tqparent is
+ parent: the server name of which channel is closing
+ child: the channle that is closing. IFF Emtpy, parent is
deleted.
Action:
Deletes the "child" window from the list of connections. If
the child is Empty the whole tree is removed since it is assumed
- the tqparent has disconnected and is closing.
+ the parent has disconnected and is closing.
new_channel: Creates popup asking for new channel name
@@ -48,9 +48,9 @@
list and join the requested channel. Does nothing if nothing
is selected in the tree list.
- recvChangeChanel(TQString tqparent, TQString old, TQString new):
+ recvChangeChanel(TQString parent, TQString old, TQString new):
Args:
- tqparent: tqparent server connection
+ parent: parent server connection
old: the old name for the window
new: the new name for the window
Action:
@@ -292,10 +292,10 @@ void servercontroller::new_channel()
if(proc_list[citem->text(0)]){ // If it's a match with a server, ok
server = citem->text(0);
}
- // Otherwise, check the tqparent to see it's perhaps a server.
- else if ( citem->tqparent() ) {
- if(proc_list[citem->tqparent()->text(0)]){
- server = citem->tqparent()->text(0);
+ // Otherwise, check the parent to see it's perhaps a server.
+ else if ( citem->parent() ) {
+ if(proc_list[citem->parent()->text(0)]){
+ server = citem->parent()->text(0);
}
}
}
@@ -355,9 +355,9 @@ void servercontroller::server_debug()
if(proc_list[citem->text(0)]){ // If it's a match with a server, ok
server = citem->text(0);
}
- else if ( citem->tqparent() ) {
- if(proc_list[citem->tqparent()->text(0)]){
- server = citem->tqparent()->text(0);
+ else if ( citem->parent() ) {
+ if(proc_list[citem->parent()->text(0)]){
+ server = citem->parent()->text(0);
}
}
@@ -406,7 +406,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
TQListViewItem *serverItem = 0L;
TQListViewItem *item = ConnectionTree->firstChild();
while ( item ) {
- if ( !item->tqparent() && item->text(0) == server ) {
+ if ( !item->parent() && item->text(0) == server ) {
serverItem = item;
break;
}
@@ -462,14 +462,14 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
break;
}
/*
- // Add new channel, first add the tqparent to the path
+ // Add new channel, first add the parent to the path
path.push(&server);
path.push(&online);
path.push(&args);
// Remove old one if it's there
ConnectionTree->removeItem(&path); // Remove the item
path.pop();
- // add a new child item with tqparent as its tqparent
+ // add a new child item with parent as its parent
ConnectionTree->addChildItem(args, pic_run, &path);
if (kSircConfig->BeepNotify) {
KNotifyClient::beep();
@@ -479,7 +479,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
/**
* Args:
- * tqparent: the server name that the new channel is being joined on
+ * parent: the server name that the new channel is being joined on
* child: the new channel name
* Action:
* Adds "child" to the list of joined channles in the main
@@ -489,7 +489,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
// Add new channel
if(args[0] == '!')
args.remove(0, 1); // If the first char is !, it's control, remove it
- // add a new child item with tqparent as it's tqparent
+ // add a new child item with parent as it's parent
item = new TQListViewItem( serverItem, args );
item->setPixmap( 0, pic_ppl );
@@ -497,13 +497,13 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
break;
/**
* Args:
- * tqparent: the server name of which channel is closing
- * child: the channle that is closing. IFF Emtpy, tqparent is
+ * parent: the server name of which channel is closing
+ * child: the channle that is closing. IFF Emtpy, parent is
* deleted.
* Action:
* Deletes the "child" window from the list of connections. If
* the child is Empty the whole tree is removed since it is assumed
- * the tqparent has disconnected and is closing.
+ * the parent has disconnected and is closing.
*/
case ProcCommand::deleteTopLevel:
// If the child is emtpy, delete the whole tree, otherwise just the child
@@ -520,7 +520,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
/**
* Args:
- * tqparent: tqparent server connection
+ * parent: parent server connection
* old: the old name for the window
* new: the new name for the window
* Action:
@@ -762,7 +762,7 @@ void servercontroller::WindowSelected(TQListViewItem *item)
if ( !item )
return;
- TQListViewItem *parent_server = item->tqparent();
+ TQListViewItem *parent_server = item->parent();
if(!parent_server)
return;
@@ -782,14 +782,14 @@ void servercontroller::WindowSelected(TQListViewItem *item)
}
-TQListViewItem * servercontroller::findChild( TQListViewItem *tqparent,
+TQListViewItem * servercontroller::findChild( TQListViewItem *parent,
const TQString& text )
{
- if ( !tqparent || tqparent->childCount() == 0 ) {
+ if ( !parent || parent->childCount() == 0 ) {
return 0L;
}
- TQListViewItem *item = tqparent->firstChild();
+ TQListViewItem *item = parent->firstChild();
while ( item ) {
if ( item->text(0) == text ) {
return item;
@@ -944,9 +944,9 @@ void servercontroller::start_autoconnect_check() {
}
-scInside::scInside ( TQWidget * tqparent, const char * name, WFlags
+scInside::scInside ( TQWidget * parent, const char * name, WFlags
f )
- : TQFrame(tqparent, name, f)
+ : TQFrame(parent, name, f)
{
ASConn = new TQLabel(i18n("Active server connections:"), this, "servercontroller_label");
TQFont asfont = ASConn->font();
diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h
index d27aef50..891ececd 100644
--- a/ksirc/servercontroller.h
+++ b/ksirc/servercontroller.h
@@ -70,7 +70,7 @@ class scInside : TQFrame
TQ_OBJECT
friend class servercontroller;
public:
- scInside ( TQWidget *tqparent = 0L, const char * name = 0, WFlags f=0 );
+ scInside ( TQWidget *parent = 0L, const char * name = 0, WFlags f=0 );
~scInside();
protected:
@@ -89,7 +89,7 @@ class servercontroller : public KMainWindow
friend class dockServerController;
public:
- servercontroller ( TQWidget* tqparent = 0L, const char* name = NULL );
+ servercontroller ( TQWidget* parent = 0L, const char* name = NULL );
virtual ~servercontroller();
const TQDict<KSircProcess> &processes() const { return proc_list; }
@@ -193,7 +193,7 @@ public slots:
void start_autoconnect_check();
- TQListViewItem * findChild( TQListViewItem *tqparent, const TQString& text );
+ TQListViewItem * findChild( TQListViewItem *parent, const TQString& text );
protected slots:
void WindowSelected(TQListViewItem *);
diff --git a/ksirc/ssfeprompt.cpp b/ksirc/ssfeprompt.cpp
index aa3e9908..bdf1aa6c 100644
--- a/ksirc/ssfeprompt.cpp
+++ b/ksirc/ssfeprompt.cpp
@@ -16,11 +16,11 @@
ssfePrompt::ssfePrompt
(
TQString prompttext,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- Inherited( tqparent, name )
+ Inherited( parent, name )
{
setCaption( i18n("Prompt") );
prompt->setText(prompttext);
diff --git a/ksirc/ssfeprompt.h b/ksirc/ssfeprompt.h
index 47500c66..fcc77eb8 100644
--- a/ksirc/ssfeprompt.h
+++ b/ksirc/ssfeprompt.h
@@ -22,7 +22,7 @@ public:
ssfePrompt
(
TQString prompttext,
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp
index 7e1f1aa0..563fc7eb 100644
--- a/ksirc/ssfepromptdata.cpp
+++ b/ksirc/ssfepromptdata.cpp
@@ -20,11 +20,11 @@
ssfepromptdata::ssfepromptdata
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- Inherited( tqparent, name, TRUE, 20480 )
+ Inherited( parent, name, TRUE, 20480 )
{
prompt = new TQLabel( this, "Label_1" );
prompt->setGeometry( 10, 10, 220, 30 );
diff --git a/ksirc/ssfepromptdata.h b/ksirc/ssfepromptdata.h
index 292d4304..da7ad712 100644
--- a/ksirc/ssfepromptdata.h
+++ b/ksirc/ssfepromptdata.h
@@ -26,7 +26,7 @@ public:
ssfepromptdata
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 1932fa03..a470c3c7 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -28,8 +28,8 @@
#include "ksparser.h"
-KSircTopic::KSircTopic( TQWidget *tqparent, const char *name )
- : KActiveLabel( tqparent, name )
+KSircTopic::KSircTopic( TQWidget *parent, const char *name )
+ : KActiveLabel( parent, name )
{
m_editor = 0;
m_doEdit = false;
@@ -180,8 +180,8 @@ void KSircTopic::fontChange(TQFont &f)
doResize();
}
-KSircTopicEditor::KSircTopicEditor( TQWidget *tqparent, const char *name )
- : TQTextEdit( tqparent, name )
+KSircTopicEditor::KSircTopicEditor( TQWidget *parent, const char *name )
+ : TQTextEdit( parent, name )
{
setWFlags( WDestructiveClose );
setFocusPolicy( TQ_ClickFocus );
diff --git a/ksirc/topic.h b/ksirc/topic.h
index f006bcc6..ccd59a8a 100644
--- a/ksirc/topic.h
+++ b/ksirc/topic.h
@@ -20,7 +20,7 @@ class KSircTopic : public KActiveLabel
Q_OBJECT
TQ_OBJECT
public:
- KSircTopic( TQWidget *tqparent, const char *name = 0 );
+ KSircTopic( TQWidget *parent, const char *name = 0 );
public slots:
virtual void setText( const TQString &);
@@ -52,7 +52,7 @@ class KSircTopicEditor : public TQTextEdit
Q_OBJECT
TQ_OBJECT
public:
- KSircTopicEditor( TQWidget *tqparent, const char *name = 0 );
+ KSircTopicEditor( TQWidget *parent, const char *name = 0 );
signals:
void resized();