diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
| tree | 2676903bb600bd9646644856e354940471ad84e2 | |
| parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
| download | tdenetwork-2bc1d728.tar.gz tdenetwork-2bc1d728.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
1261 files changed, 3209 insertions, 3209 deletions
diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index c36e982c..1c6810c6 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -13,15 +13,15 @@ #include <tqdatastream.h> #include <tqvbox.h> -CategoryItem::CategoryItem( KListView *tqparent, const TQString &category ) - : KListViewItem( tqparent ), +CategoryItem::CategoryItem( KListView *parent, const TQString &category ) + : KListViewItem( parent ), m_category( category ) { init(); } -CategoryItem::CategoryItem( KListViewItem *tqparent, const TQString &category ) - : KListViewItem( tqparent ), +CategoryItem::CategoryItem( KListViewItem *parent, const TQString &category ) + : KListViewItem( parent ), m_category( category ) { init(); @@ -66,8 +66,8 @@ void CategoryItem::gotCategories( const TQStringList &categories ) KListViewItem::setOpen( true ); } -DCOPRSSIface::DCOPRSSIface( TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), DCOPObject( "FeedBrowser" ) +DCOPRSSIface::DCOPRSSIface( TQObject *parent, const char *name ) : + TQObject( parent, name ), DCOPObject( "FeedBrowser" ) { connectDCOPSignal( "rssservice", "RSSQuery", "gotCategories(TQStringList)", "slotGotCategories(TQStringList)", false ); @@ -87,8 +87,8 @@ void DCOPRSSIface::slotGotCategories( const TQStringList &categories ) emit gotCategories( categories ); } -FeedBrowserDlg::FeedBrowserDlg( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n( "DCOPRSS Feed Browser" ), +FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "DCOPRSS Feed Browser" ), Close, Close, true ) { m_dcopIface = new DCOPRSSIface( TQT_TQOBJECT(this), "m_dcopIface" ); diff --git a/dcoprss/feedbrowser.h b/dcoprss/feedbrowser.h index 88d24ea8..460e63e7 100644 --- a/dcoprss/feedbrowser.h +++ b/dcoprss/feedbrowser.h @@ -12,7 +12,7 @@ class DCOPRSSIface : public TQObject, public DCOPObject Q_OBJECT // TQ_OBJECT public: - DCOPRSSIface( TQObject *tqparent, const char *name = 0 ); + DCOPRSSIface( TQObject *parent, const char *name = 0 ); k_dcop: void slotGotCategories( const TQStringList &categories ); @@ -29,8 +29,8 @@ class CategoryItem : public TQObject, public KListViewItem Q_OBJECT // TQ_OBJECT public: - CategoryItem( KListView *tqparent, const TQString &category ); - CategoryItem( KListViewItem *tqparent, const TQString &category ); + CategoryItem( KListView *parent, const TQString &category ); + CategoryItem( KListViewItem *parent, const TQString &category ); virtual void setOpen( bool open ); @@ -52,7 +52,7 @@ class FeedBrowserDlg : public KDialogBase // TQ_OBJECT friend class CategoryItem; public: - FeedBrowserDlg( TQWidget *tqparent, const char *name = 0 ); + FeedBrowserDlg( TQWidget *parent, const char *name = 0 ); private slots: void itemSelected( TQListViewItem *item ); diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp index a70053d0..73060216 100644 --- a/dcoprss/xmlrpciface.cpp +++ b/dcoprss/xmlrpciface.cpp @@ -33,9 +33,9 @@ using namespace KXMLRPC; -Query *Query::create( TQObject *tqparent, const char *name ) +Query *Query::create( TQObject *parent, const char *name ) { - return new Query( tqparent, name ); + return new Query( parent, name ); } void Query::call( const TQString &server, const TQString &method, @@ -282,7 +282,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) return TQVariant(); } -Query::Query( TQObject *tqparent, const char *name ) : TQObject( tqparent, name ) +Query::Query( TQObject *parent, const char *name ) : TQObject( parent, name ) { } @@ -352,8 +352,8 @@ TQValueList<TQVariant> Server::toVariantList( const TQStringList &arg ) return args; } -Server::Server( const KURL &url, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +Server::Server( const KURL &url, TQObject *parent, const char *name ) + : TQObject( parent, name ) { if ( url.isValid() ) m_url = url; diff --git a/dcoprss/xmlrpciface.h b/dcoprss/xmlrpciface.h index e100ade1..b157fb1c 100644 --- a/dcoprss/xmlrpciface.h +++ b/dcoprss/xmlrpciface.h @@ -77,7 +77,7 @@ namespace KXMLRPC TQValueList<TQVariant> m_args; }; - static Query *create( TQObject *tqparent = 0, const char *name = 0 ); + static Query *create( TQObject *parent = 0, const char *name = 0 ); static TQString marshal( const TQVariant &v ); static TQVariant demarshal( const TQDomElement &e ); @@ -105,7 +105,7 @@ namespace KXMLRPC TQString markupCall( const TQString &method, const TQValueList<TQVariant> &args ) const; - Query( TQObject *tqparent = 0, const char *name = 0 ); + Query( TQObject *parent = 0, const char *name = 0 ); TQBuffer m_buffer; TQString m_server; @@ -119,7 +119,7 @@ namespace KXMLRPC TQ_OBJECT public: Server( const KURL &url = KURL(), - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); const KURL &url() const { return m_url; } void setUrl( const KURL &url ); diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp index 4ad53b0f..53b7c812 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp @@ -35,8 +35,8 @@ #include "filemodedlgimpl.h" -FileModeDlgImpl::FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit) - : FileModeDlg(tqparent) +FileModeDlgImpl::FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit) + : FileModeDlg(parent) { assert(edit); _edit = edit; diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h index feca9624..a8e2c5a3 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h @@ -53,7 +53,7 @@ class FileModeDlgImpl : public FileModeDlg Q_OBJECT TQ_OBJECT public: - FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit); + FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit); ~FileModeDlgImpl(); protected: TQLineEdit* _edit; diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 70d2bda6..31a642ff 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -62,8 +62,8 @@ #define HIDDENTABINDEX 5 -HiddenListViewItem::HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false ) - : QMultiCheckListItem( tqparent ) +HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false ) + : QMultiCheckListItem( parent ) { setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall)); diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 6ce1c380..27bd7c7b 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -44,7 +44,7 @@ class HiddenListViewItem : public QMultiCheckListItem Q_OBJECT TQ_OBJECT public: - HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); + HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); ~HiddenListViewItem(); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index ce411c69..7914aef2 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -75,8 +75,8 @@ #define COL_NOPASSWORD 3 -ShareListViewItem::ShareListViewItem(TQListView * tqparent, SambaShare* share) - : TQListViewItem(tqparent) +ShareListViewItem::ShareListViewItem(TQListView * parent, SambaShare* share) + : TQListViewItem(parent) { setShare(share); } @@ -174,8 +174,8 @@ TQPixmap ShareListViewItem::createPropertyPixmap() return TQPixmap(pix); } -KcmSambaConf::KcmSambaConf(TQWidget *tqparent, const char *name) - : KCModule(tqparent,name) +KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name) + : KCModule(parent,name) { _dictMngr = 0L; _sambaFile = 0L; @@ -1432,10 +1432,10 @@ TQString KcmSambaConf::quickHelp() const extern "C" { - KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *tqparent, const char *name) + KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name) { KGlobal::locale()->insertCatalogue("kfileshare"); - return new KcmSambaConf(tqparent, name); + return new KcmSambaConf(parent, name); } } diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h index 03032c87..d4c81992 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h @@ -47,7 +47,7 @@ class TQPixmap; class ShareListViewItem : public TQListViewItem { public: - ShareListViewItem(TQListView * tqparent, SambaShare* share); + ShareListViewItem(TQListView * parent, SambaShare* share); SambaShare* getShare() const; void setShare(SambaShare* share); @@ -71,7 +71,7 @@ class KcmSambaConf: public KCModule Q_OBJECT TQ_OBJECT public: - KcmSambaConf(TQWidget *tqparent = 0L, const char *name = 0L); + KcmSambaConf(TQWidget *parent = 0L, const char *name = 0L); virtual ~KcmSambaConf(); void load(const TQString &); diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp index 6d8668e4..5bac2fdf 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp @@ -34,10 +34,10 @@ #include "sambashare.h" #include "linuxpermissionchecker.h" -LinuxPermissionChecker::LinuxPermissionChecker(SambaShare* share,TQWidget* tqparent = 0L) +LinuxPermissionChecker::LinuxPermissionChecker(SambaShare* share,TQWidget* parent = 0L) { m_sambaShare = share; - m_parent = tqparent; + m_parent = parent; if (!share) { kdWarning() << "WARNING: LinuxPermissionChecker: share is null !" << endl; diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h index f50cd055..05b67656 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h @@ -43,7 +43,7 @@ class TQWidget; */ class LinuxPermissionChecker{ public: - LinuxPermissionChecker(SambaShare*,TQWidget* tqparent ); + LinuxPermissionChecker(SambaShare*,TQWidget* parent ); ~LinuxPermissionChecker(); /** diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 9a842dfb..da11d799 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -61,8 +61,8 @@ #include "dictmanager.h" -PrinterDlgImpl::PrinterDlgImpl(TQWidget* tqparent, SambaShare* share) - : KcmPrinterDlg(tqparent,"sharedlgimpl") +PrinterDlgImpl::PrinterDlgImpl(TQWidget* parent, SambaShare* share) + : KcmPrinterDlg(parent,"sharedlgimpl") { if (!share) { kdWarning() << "PrinterDlgImpl::Constructor : share parameter is null!" << endl; @@ -212,19 +212,19 @@ void PrinterDlgImpl::printersChkToggled(bool b) p.drawPixmap(dist+dist/2,2*dist,pix2); p.end(); - TQBitmap tqmask(w,h); + TQBitmap mask(w,h); - tqmask.fill(TQt::black); // everything is transparent + mask.fill(TQt::black); // everything is transparent - p.begin(&tqmask); + p.begin(&mask); p.setRasterOp(TQt::OrROP); - p.drawPixmap(dist+dist/2,0,*pix2.tqmask()); - p.drawPixmap(dist/2,dist,*pix2.tqmask()); - p.drawPixmap(dist+dist/2,2*dist,*pix2.tqmask()); + p.drawPixmap(dist+dist/2,0,*pix2.mask()); + p.drawPixmap(dist/2,dist,*pix2.mask()); + p.drawPixmap(dist+dist/2,2*dist,*pix2.mask()); p.end(); - pix.setMask(tqmask); + pix.setMask(mask); printerPixLbl->setPixmap(pix); pixFrame->tqlayout()->setMargin( 2 ); diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h index 56d7ae7f..66507710 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h @@ -51,7 +51,7 @@ Q_OBJECT public : - PrinterDlgImpl(TQWidget* tqparent, SambaShare* share); + PrinterDlgImpl(TQWidget* parent, SambaShare* share); ~PrinterDlgImpl(); protected : diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp index 094daa9c..1600aa7c 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp @@ -40,8 +40,8 @@ static const int BoxSize = 16; -QMultiCheckListItem::QMultiCheckListItem( TQListView *tqparent=0) : - TQListViewItem(tqparent) { +QMultiCheckListItem::QMultiCheckListItem( TQListView *parent=0) : + TQListViewItem(parent) { } void QMultiCheckListItem::setOn(int column, bool b) { @@ -108,7 +108,7 @@ void QMultiCheckListItem::paintCell(TQPainter *p,const TQColorGroup & cg, int co // Bold/Italic/use default checkboxes // code allmost identical to TQCheckListItem Q_ASSERT( lv ); //### - // I use the text color of defaultStyles[0], normalcol in tqparent listview + // I use the text color of defaultStyles[0], normalcol in parent listview // mcg.setColor( TQColorGroup::Text, ((StyleListView*)lv)->normalcol ); int x = 0; if ( align == AlignCenter ) { diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h index 46b54cde..d7c39343 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - QMultiCheckListItem( TQListView *tqparent); + QMultiCheckListItem( TQListView *parent); ~QMultiCheckListItem() {}; virtual bool isOn(int column); diff --git a/filesharing/advanced/kcm_sambaconf/sambashare.cpp b/filesharing/advanced/kcm_sambaconf/sambashare.cpp index c4f02af9..a2c58565 100644 --- a/filesharing/advanced/kcm_sambaconf/sambashare.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambashare.cpp @@ -139,12 +139,12 @@ TQString SambaShare::getSynonym(const TQString & name) const if (lname == "allow hosts") return "hosts allow"; if (lname == "auto services") return "preload"; if (lname == "casesignames") return "case sensitive"; - if (lname == "create mode") return "create tqmask"; + if (lname == "create mode") return "create mask"; if (lname == "debuglevel") return "log level"; if (lname == "default") return "default service"; if (lname == "deny hosts") return "hosts deny"; if (lname == "directory") return "path"; - if (lname == "directory mode") return "directory tqmask"; + if (lname == "directory mode") return "directory mask"; if (lname == "exec") return "preexec"; if (lname == "group") return "force group"; if (lname == "lock dir") return "lock directory"; diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index bcc0684e..65fff9c5 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -1223,7 +1223,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_2_2_2</cstring> </property> <property name="text"> - <string>Directory security tqmask:</string> + <string>Directory security mask:</string> </property> <property name="buddy" stdset="0"> <cstring>directorySecurityMaskEdit</cstring> @@ -1237,7 +1237,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_3</cstring> </property> <property name="text"> - <string>Security &tqmask:</string> + <string>Security &mask:</string> </property> <property name="buddy" stdset="0"> <cstring>securityMaskEdit</cstring> @@ -1251,7 +1251,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_2_3</cstring> </property> <property name="text"> - <string>Direc&tory tqmask:</string> + <string>Direc&tory mask:</string> </property> <property name="buddy" stdset="0"> <cstring>directoryMaskEdit</cstring> @@ -1524,7 +1524,7 @@ Only change something if you know what you are doing.</string> <cstring>inheritPermissionsChk</cstring> </property> <property name="text"> - <string>Inherit permissions from tqparent directory</string> + <string>Inherit permissions from parent directory</string> </property> </widget> <widget class="TQCheckBox"> diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 3c0a8cab..55a1983c 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -80,8 +80,8 @@ -ShareDlgImpl::ShareDlgImpl(TQWidget* tqparent, SambaShare* share) - : KcmShareDlg(tqparent,"sharedlgimpl") +ShareDlgImpl::ShareDlgImpl(TQWidget* parent, SambaShare* share) + : KcmShareDlg(parent,"sharedlgimpl") { if (!share) { kdWarning() << "ShareDlgImpl::Constructor : share parameter is null!" << endl; @@ -169,10 +169,10 @@ void ShareDlgImpl::initDialog() _dictMngr->add("force security mode",forceSecurityModeEdit); _dictMngr->add("force create mode",forceCreateModeEdit); - _dictMngr->add("directory security tqmask",directorySecurityMaskEdit); - _dictMngr->add("directory tqmask",directoryMaskEdit); - _dictMngr->add("security tqmask",securityMaskEdit); - _dictMngr->add("create tqmask",createMaskEdit); + _dictMngr->add("directory security mask",directorySecurityMaskEdit); + _dictMngr->add("directory mask",directoryMaskEdit); + _dictMngr->add("security mask",securityMaskEdit); + _dictMngr->add("create mask",createMaskEdit); _dictMngr->add("inherit permissions",inheritPermissionsChk); _dictMngr->add("inherit acls",inheritAclsChk); _dictMngr->add("nt acl support",ntAclSupportChk); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h index 450b634b..3c5a56aa 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h @@ -58,7 +58,7 @@ Q_OBJECT public : - ShareDlgImpl(TQWidget* tqparent, SambaShare* share); + ShareDlgImpl(TQWidget* parent, SambaShare* share); ~ShareDlgImpl(); bool hasChanged() { return m_changed; }; diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3ee78bf8..3805429b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -39,8 +39,8 @@ #include "smbconfconfigwidget.h" -SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* tqparent) - : TQWidget(tqparent,"configWidget") +SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) + : TQWidget(parent,"configWidget") { TQVBoxLayout *tqlayout = new TQVBoxLayout(this,5); diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp index 366a3f15..c07da925 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp @@ -57,8 +57,8 @@ * @pre share is not null * @post _share = share */ -UserTabImpl::UserTabImpl(TQWidget* tqparent, SambaShare* share) - : UserTab(tqparent) +UserTabImpl::UserTabImpl(TQWidget* parent, SambaShare* share) + : UserTab(parent) { if (share == 0L) { kdWarning() << "WARNING: UserTabImpl constructor: share parameter is null!" << endl; diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.h b/filesharing/advanced/kcm_sambaconf/usertabimpl.h index cfa4ac1a..d7ad378b 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.h +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.h @@ -50,7 +50,7 @@ class UserTabImpl : public UserTab Q_OBJECT TQ_OBJECT public: - UserTabImpl(TQWidget* tqparent, SambaShare* share); + UserTabImpl(TQWidget* parent, SambaShare* share); ~UserTabImpl(); void load(); diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index 32b5eb54..b7fd9f79 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -103,7 +103,7 @@ The host may be specified in a number of ways: <i>IP networks</i> <p> - You can also export directories to all hosts on an IP (sub-) network simultaneously. This is done by specifying an IP address and nettqmask pair as address/nettqmask where the nettqmask can be specified in dotted-decimal format, or as a contiguous tqmask length (for example, either `/255.255.252.0' or `/22' appended to the network base address result in identical subnetworks with 10 bits of host). + You can also export directories to all hosts on an IP (sub-) network simultaneously. This is done by specifying an IP address and netmask pair as address/netmask where the netmask can be specified in dotted-decimal format, or as a contiguous mask length (for example, either `/255.255.252.0' or `/22' appended to the network base address result in identical subnetworks with 10 bits of host). </p></string> </property> </widget> @@ -226,13 +226,13 @@ This option only has effect if sync is also set. The NFS server will normally de <property name="whatsThis" stdset="0"> <string><b>No hide</b> <p> -This option is based on the option of the same name provided in IRIX NFS. Normally, if a server exports two filesystems one of which is mounted on the other, then the client will have to mount both filesystems explicitly to get access to them. If it just mounts the tqparent, it will see an empty directory at the place where the other filesystem is mounted. That filesystem is "hidden". +This option is based on the option of the same name provided in IRIX NFS. Normally, if a server exports two filesystems one of which is mounted on the other, then the client will have to mount both filesystems explicitly to get access to them. If it just mounts the parent, it will see an empty directory at the place where the other filesystem is mounted. That filesystem is "hidden". </p> <p> -Setting the nohide option on a filesystem causes it not to be hidden, and an appropriately authorized client will be able to move from the tqparent to that filesystem without noticing the change. +Setting the nohide option on a filesystem causes it not to be hidden, and an appropriately authorized client will be able to move from the parent to that filesystem without noticing the change. </p> <p> -However, some NFS clients do not cope well with this situation as, for instance, it is then possible for two files in the one aptqparent filesystem to have the same inode number. +However, some NFS clients do not cope well with this situation as, for instance, it is then possible for two files in the one apparent filesystem to have the same inode number. </p> <p> The nohide option is currently only effective on single host exports. It does not work reliably with netgroup, subnet, or wildcard exports. diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index d7b12161..ecc93a7d 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -38,8 +38,8 @@ #include "nfsfile.h" #include "nfsdialoggui.h" -NFSDialog::NFSDialog(TQWidget * tqparent, NFSEntry* entry) - : KDialogBase(Plain, i18n("NFS Options"), Ok|Cancel, Ok, tqparent), +NFSDialog::NFSDialog(TQWidget * parent, NFSEntry* entry) + : KDialogBase(Plain, i18n("NFS Options"), Ok|Cancel, Ok, parent), m_nfsEntry(entry), m_modified(false) { diff --git a/filesharing/advanced/nfs/nfsdialog.h b/filesharing/advanced/nfs/nfsdialog.h index 90effdae..ec79f9a4 100644 --- a/filesharing/advanced/nfs/nfsdialog.h +++ b/filesharing/advanced/nfs/nfsdialog.h @@ -33,7 +33,7 @@ class NFSDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - NFSDialog(TQWidget * tqparent, NFSEntry* entry); + NFSDialog(TQWidget * parent, NFSEntry* entry); ~NFSDialog(); bool modified(); protected: diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index e13be0c7..c4c1002d 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -32,8 +32,8 @@ #include "nfsentry.h" -NFSHostDlg::NFSHostDlg(TQWidget* tqparent, HostList* hosts, NFSEntry* entry) - : KDialogBase(Plain, i18n("Host Properties"), Ok|Cancel, Ok, tqparent), +NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry) + : KDialogBase(Plain, i18n("Host Properties"), Ok|Cancel, Ok, parent), m_hosts(hosts), m_nfsEntry(entry), m_modified(false) { diff --git a/filesharing/advanced/nfs/nfshostdlg.h b/filesharing/advanced/nfs/nfshostdlg.h index b035b67a..1cf745de 100644 --- a/filesharing/advanced/nfs/nfshostdlg.h +++ b/filesharing/advanced/nfs/nfshostdlg.h @@ -33,7 +33,7 @@ class NFSHostDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - NFSHostDlg(TQWidget* tqparent, HostList* hosts, NFSEntry* entry); + NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry); virtual ~NFSHostDlg(); bool isModified(); protected: diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index f32ba757..24efa0e5 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -52,8 +52,8 @@ #define FILESHARE_DEBUG 5009 -PropertiesPage::PropertiesPage(TQWidget* tqparent, KFileItemList items,bool enterUrl) - : PropertiesPageGUI(tqparent), +PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterUrl) + : PropertiesPageGUI(parent), m_enterUrl(enterUrl), m_items(items), m_nfsFile(0), diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.h b/filesharing/advanced/propsdlgplugin/propertiespage.h index 4e93ac86..db64c9a8 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.h +++ b/filesharing/advanced/propsdlgplugin/propertiespage.h @@ -34,7 +34,7 @@ class PropertiesPage : public PropertiesPageGUI Q_OBJECT TQ_OBJECT public: - PropertiesPage(TQWidget* tqparent, KFileItemList items, bool enterUrl=false); + PropertiesPage(TQWidget* parent, KFileItemList items, bool enterUrl=false); virtual ~PropertiesPage(); bool save(); diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 2e332dd7..0e41554d 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -60,8 +60,8 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") ) #define FILESHARECONF "/etc/security/fileshare.conf" #define FILESHARE_DEBUG 5009 -KFileShareConfig::KFileShareConfig(TQWidget *tqparent, const char *name, const TQStringList &): - KCModule(ShareFactory::instance(), tqparent, name) +KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &): + KCModule(ShareFactory::instance(), parent, name) { KGlobal::locale()->insertCatalogue("kfileshare"); @@ -354,8 +354,8 @@ void KFileShareConfig::addShareBtnClicked() { } -PropertiesPageDlg::PropertiesPageDlg(TQWidget*tqparent, KFileItemList files) - : KDialogBase(tqparent, "sharedlg", true, +PropertiesPageDlg::PropertiesPageDlg(TQWidget*parent, KFileItemList files) + : KDialogBase(parent, "sharedlg", true, i18n("Share Folder"), Ok|Cancel, Ok, true) { TQVBox* vbox = makeVBoxMainWidget(); diff --git a/filesharing/simple/fileshare.h b/filesharing/simple/fileshare.h index 098ee6e5..9edf5ef8 100644 --- a/filesharing/simple/fileshare.h +++ b/filesharing/simple/fileshare.h @@ -34,7 +34,7 @@ class KFileShareConfig : public KCModule TQ_OBJECT public: - KFileShareConfig(TQWidget *tqparent, const char *name, const TQStringList &); + KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &); virtual void load(); virtual void save(); @@ -68,7 +68,7 @@ class PropertiesPageDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - PropertiesPageDlg(TQWidget * tqparent, KFileItemList files); + PropertiesPageDlg(TQWidget * parent, KFileItemList files); ~PropertiesPageDlg() {}; bool hasChanged(); protected: diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index e4f52356..1efe2baa 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -48,10 +48,10 @@ static bool userMod(const TQString & user, const TQValueList<KUserGroup> & group -GroupConfigDlg::GroupConfigDlg(TQWidget * tqparent, +GroupConfigDlg::GroupConfigDlg(TQWidget * parent, const TQString & fileShareGroup, bool restricted, bool rootPassNeeded, bool simpleSharing) - : KDialogBase(tqparent,"groupconfigdlg", true, + : KDialogBase(parent,"groupconfigdlg", true, i18n("Allowed Users"), Ok|Cancel, Ok, true) , m_fileShareGroup(fileShareGroup), m_restricted(restricted) , diff --git a/filesharing/simple/groupconfigdlg.h b/filesharing/simple/groupconfigdlg.h index 744a9e91..ab0078c9 100644 --- a/filesharing/simple/groupconfigdlg.h +++ b/filesharing/simple/groupconfigdlg.h @@ -31,7 +31,7 @@ class GroupConfigDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - GroupConfigDlg(TQWidget * tqparent, const TQString & fileShareGroup, bool restricted, + GroupConfigDlg(TQWidget * parent, const TQString & fileShareGroup, bool restricted, bool rootPassNeeded, bool simpleSharing); ~GroupConfigDlg(); KUserGroup fileShareGroup() { return m_fileShareGroup; } diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp index a604b0de..3d9dfcd0 100644 --- a/filesharing/simple/krichtextlabel.cpp +++ b/filesharing/simple/krichtextlabel.cpp @@ -38,15 +38,15 @@ static TQString qrichtextify( const TQString& text ) return lines.join(TQString()); } -KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); setText(text); } -KRichTextLabel::KRichTextLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); } diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h index 42e7a758..e9b59d4e 100644 --- a/filesharing/simple/krichtextlabel.h +++ b/filesharing/simple/krichtextlabel.h @@ -40,8 +40,8 @@ public: /** * Default constructor. */ - KRichTextLabel( TQWidget *tqparent, const char *name = 0 ); - KRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); + KRichTextLabel( TQWidget *parent, const char *name = 0 ); + KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 0ae5c793..5f5480aa 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -24,9 +24,9 @@ #include <ktoolbar.h> -DictComboAction::DictComboAction( const TQString &text, TQObject *tqparent, const char *name, +DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, bool editable, bool autoSized ) - : KAction( text, 0, tqparent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode()) + : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode()) { } @@ -193,8 +193,8 @@ void DictComboAction::slotComboActivated(const TQString &s) //********************************************************************************* -DictLabelAction::DictLabelAction( const TQString &text, TQObject *tqparent, const char *name ) - : KAction( text, 0, tqparent, name ) +DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name ) + : KAction( text, 0, parent, name ) { } @@ -263,8 +263,8 @@ void DictLabelAction::setBuddy(TQWidget *buddy) DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name ) - : KAction( text, 0, receiver, slot, tqparent, name ) + const char* slot, TQObject* parent, const char* name ) + : KAction( text, 0, receiver, slot, parent, name ) { } diff --git a/kdict/actions.h b/kdict/actions.h index 3ce80182..acee05d4 100644 --- a/kdict/actions.h +++ b/kdict/actions.h @@ -34,7 +34,7 @@ class DictComboAction : public KAction TQ_OBJECT public: - DictComboAction( const TQString& text, TQObject* tqparent, + DictComboAction( const TQString& text, TQObject* parent, const char* name, bool editable, bool autoSized ); ~DictComboAction(); @@ -77,7 +77,7 @@ class DictLabelAction : public KAction TQ_OBJECT public: - DictLabelAction( const TQString &text, TQObject *tqparent = 0, const char *name = 0 ); + DictLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 ); ~DictLabelAction(); virtual int plug( TQWidget *widget, int index = -1 ); @@ -98,7 +98,7 @@ class DictButtonAction : public KAction public: DictButtonAction( const TQString& text, TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name ); + const char* slot, TQObject* parent, const char* name ); ~DictButtonAction(); virtual int plug( TQWidget *w, int index = -1 ); diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 74ad2e0b..0179f0b8 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -74,16 +74,16 @@ void PopupBox::enablePopup() extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kdictapplet"); - return new DictApplet(configFile, KPanelApplet::Stretch, 0, tqparent, "kdictapplet"); + return new DictApplet(configFile, KPanelApplet::Stretch, 0, parent, "kdictapplet"); } } -DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), waiting(0) +DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), waiting(0) { // first the widgets for a horizontal panel baseWidget = new TQWidget(this); diff --git a/kdict/applet/kdictapplet.h b/kdict/applet/kdictapplet.h index a79300af..39a18d07 100644 --- a/kdict/applet/kdictapplet.h +++ b/kdict/applet/kdictapplet.h @@ -63,7 +63,7 @@ class DictApplet : public KPanelApplet TQ_OBJECT public: - DictApplet(const TQString& configFile, Type t = Stretch, int actions = 0, TQWidget *tqparent = 0, const char *name = 0); + DictApplet(const TQString& configFile, Type t = Stretch, int actions = 0, TQWidget *parent = 0, const char *name = 0); virtual ~DictApplet(); int widthForHeight(int height) const; diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 76e05c6f..e4dd030b 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -110,8 +110,8 @@ void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, //********* MatchView ****************************************** -MatchView::MatchView(TQWidget *tqparent, const char *name) - : TQWidget(tqparent,name),getOn(false),getAllOn(false) +MatchView::MatchView(TQWidget *parent, const char *name) + : TQWidget(parent,name),getOn(false),getAllOn(false) { setCaption(kapp->makeStdCaption(i18n("Match List"))); @@ -232,7 +232,7 @@ void MatchView::getOneItem(TQListViewItem *i) { TQStringList defines; - if ((!i->childCount())&&(i->tqparent())) + if ((!i->childCount())&&(i->parent())) defines.append(((MatchViewItem *)(i))->command); else { i = i->firstChild(); @@ -378,7 +378,7 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int) { rightBtnMenu->clear(); - if ((i!=0L)&&(i->isExpandable()||i->tqparent())) { + if ((i!=0L)&&(i->isExpandable()||i->parent())) { popupCurrent = (MatchViewItem *)(i); rightBtnMenu->insertItem(i18n("&Get"),this,TQT_SLOT(popupGetCurrent())); if (!i->isExpandable()) { // toplevel item -> only "get" diff --git a/kdict/matchview.h b/kdict/matchview.h index 54c2dab5..5a459e34 100644 --- a/kdict/matchview.h +++ b/kdict/matchview.h @@ -52,7 +52,7 @@ class MatchView : public TQWidget public: - MatchView(TQWidget *tqparent=0,const char *name=0); + MatchView(TQWidget *parent=0,const char *name=0); ~MatchView(); void updateStrategyCombo(); diff --git a/kdict/options.cpp b/kdict/options.cpp index ab60e86c..de10606d 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -384,8 +384,8 @@ TQString GlobalData::encryptStr(const TQString& aStr) //********* OptionsDialog::DialogListBox ***************************** -OptionsDialog::DialogListBox::DialogListBox(bool alwaysIgnore, TQWidget * tqparent, const char * name) - : TQListBox(tqparent, name), a_lwaysIgnore(alwaysIgnore) +OptionsDialog::DialogListBox::DialogListBox(bool alwaysIgnore, TQWidget * parent, const char * name) + : TQListBox(parent, name), a_lwaysIgnore(alwaysIgnore) { } @@ -488,8 +488,8 @@ int OptionsDialog::FontListItem::width(const TQListBox *lb ) const //********* OptionsDialog ****************************************** -OptionsDialog::OptionsDialog(TQWidget *tqparent, const char *name) - : KDialogBase(IconList, i18n("Configure"), Help|Default|Ok|Apply|Cancel, Ok, tqparent, name, false, true) +OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) + : KDialogBase(IconList, i18n("Configure"), Help|Default|Ok|Apply|Cancel, Ok, parent, name, false, true) { //******** Server ************************************ diff --git a/kdict/options.h b/kdict/options.h index 1209f565..a1b2745e 100644 --- a/kdict/options.h +++ b/kdict/options.h @@ -115,7 +115,7 @@ class OptionsDialog : public KDialogBase public: - OptionsDialog(TQWidget *tqparent=0, const char *name=0); + OptionsDialog(TQWidget *parent=0, const char *name=0); ~OptionsDialog(); //=================================================================================== @@ -124,7 +124,7 @@ public: public: // alwaysIgnore==false: enter is ignored when the widget isn't visible/out of focus - DialogListBox(bool alwaysIgnore=false, TQWidget * tqparent=0, const char * name=0); + DialogListBox(bool alwaysIgnore=false, TQWidget * parent=0, const char * name=0); ~DialogListBox(); protected: diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 61411cd2..3b0cf9e3 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -40,8 +40,8 @@ TQString SaveHelper::lastPath; -SaveHelper::SaveHelper(const TQString &saveName, const TQString &filter, TQWidget *tqparent) - : p_arent(tqparent), s_aveName(saveName), f_ilter(filter), file(0), tmpFile(0) +SaveHelper::SaveHelper(const TQString &saveName, const TQString &filter, TQWidget *parent) + : p_arent(parent), s_aveName(saveName), f_ilter(filter), file(0), tmpFile(0) { } diff --git a/kdict/queryview.h b/kdict/queryview.h index f4c441f9..3c24fc17 100644 --- a/kdict/queryview.h +++ b/kdict/queryview.h @@ -38,7 +38,7 @@ class SaveHelper { public: - SaveHelper(const TQString &saveName, const TQString &filter, TQWidget *tqparent); + SaveHelper(const TQString &saveName, const TQString &filter, TQWidget *parent); ~SaveHelper(); // returns a file open for writing diff --git a/kdict/sets.cpp b/kdict/sets.cpp index e4fccd2b..fe3f2636 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -29,8 +29,8 @@ //********* DbSetsDialog ****************************************** -DbSetsDialog::DbSetsDialog(TQWidget *tqparent, const char *name) - : KDialogBase(Plain, i18n("Database Sets"),Close | Help, Close, tqparent, name, false, true) +DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) + : KDialogBase(Plain, i18n("Database Sets"),Close | Help, Close, parent, name, false, true) { TQFrame* page=plainPage(); diff --git a/kdict/sets.h b/kdict/sets.h index 6e8397c6..b2d1a698 100644 --- a/kdict/sets.h +++ b/kdict/sets.h @@ -31,7 +31,7 @@ class DbSetsDialog : public KDialogBase public: - DbSetsDialog(TQWidget *tqparent=0, const char *name=0); + DbSetsDialog(TQWidget *parent=0, const char *name=0); signals: diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 31cb4dfa..91070af8 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -50,8 +50,8 @@ DictInterface *interface; GlobalData *global; -TopLevel::TopLevel(TQWidget* tqparent, const char* name) - : DCOPObject("KDictIface"), KMainWindow(tqparent, name, WType_TopLevel), +TopLevel::TopLevel(TQWidget* parent, const char* name) + : DCOPObject("KDictIface"), KMainWindow(parent, name, WType_TopLevel), optDlg(0L), setsDlg(0L), stopRef(0) { kapp->dcopClient()->setDefaultObject(objId()); diff --git a/kdict/toplevel.h b/kdict/toplevel.h index 47295405..7362ed7f 100644 --- a/kdict/toplevel.h +++ b/kdict/toplevel.h @@ -44,7 +44,7 @@ class TopLevel : public KMainWindow, virtual public KDictIface public: - TopLevel(TQWidget* tqparent = 0, const char* name = 0); + TopLevel(TQWidget* parent = 0, const char* name = 0); ~TopLevel(); void normalStartup(); // called when started without commandline parameters diff --git a/kfile-plugins/torrent/kfile_torrent.cpp b/kfile-plugins/torrent/kfile_torrent.cpp index a4cff355..69767129 100644 --- a/kfile-plugins/torrent/kfile_torrent.cpp +++ b/kfile-plugins/torrent/kfile_torrent.cpp @@ -37,9 +37,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_torrent, TorrentFactory("kfile_torrent")) TQStringList filesList (BList *list); TQ_ULLONG filesLength (BList *list); -KTorrentPlugin::KTorrentPlugin (TQObject *tqparent, const char *name, +KTorrentPlugin::KTorrentPlugin (TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin (tqparent, name, args), m_failed(true), m_dict(0) + : KFilePlugin (parent, name, args), m_failed(true), m_dict(0) { KFileMimeTypeInfo *info = addMimeTypeInfo ("application/x-bittorrent"); if (!info) diff --git a/kfile-plugins/torrent/kfile_torrent.h b/kfile-plugins/torrent/kfile_torrent.h index 203e2b55..b7b329a7 100644 --- a/kfile-plugins/torrent/kfile_torrent.h +++ b/kfile-plugins/torrent/kfile_torrent.h @@ -44,11 +44,11 @@ class KTorrentPlugin : public KFilePlugin /** * Constructs the class, and prepares for reading info on a torrent. * - * @param tqparent the tqparent of this object + * @param parent the parent of this object * @param name the name of this object (not user-readable) * @param args unused by this class */ - KTorrentPlugin (TQObject *tqparent, const char *name, const TQStringList &args); + KTorrentPlugin (TQObject *parent, const char *name, const TQStringList &args); /** * Destructor that closes the dictionary holding the torrent information. diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp index 1fb2ebaa..e4dee980 100644 --- a/kget/dlgAdvanced.cpp +++ b/kget/dlgAdvanced.cpp @@ -38,8 +38,8 @@ -DlgAdvanced::DlgAdvanced(TQWidget * tqparent) - : DlgAdvancedBase(tqparent) +DlgAdvanced::DlgAdvanced(TQWidget * parent) + : DlgAdvancedBase(parent) { cb_partial->hide(); } diff --git a/kget/dlgAdvanced.h b/kget/dlgAdvanced.h index c7fdb797..7d426503 100644 --- a/kget/dlgAdvanced.h +++ b/kget/dlgAdvanced.h @@ -36,7 +36,7 @@ class DlgAdvanced : public DlgAdvancedBase public: - DlgAdvanced(TQWidget * tqparent); + DlgAdvanced(TQWidget * parent); ~DlgAdvanced() {} void applyData(); diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp index 01762aa1..779cacf3 100644 --- a/kget/dlgAutomation.cpp +++ b/kget/dlgAutomation.cpp @@ -42,8 +42,8 @@ #include "dlgAutomation.h" -DlgAutomation::DlgAutomation(TQWidget * tqparent) - : DlgAutomationBase(tqparent) +DlgAutomation::DlgAutomation(TQWidget * parent) + : DlgAutomationBase(parent) { } diff --git a/kget/dlgAutomation.h b/kget/dlgAutomation.h index ada27c45..8a3025dd 100644 --- a/kget/dlgAutomation.h +++ b/kget/dlgAutomation.h @@ -41,7 +41,7 @@ class DlgAutomation:public DlgAutomationBase public: - DlgAutomation(TQWidget * tqparent); + DlgAutomation(TQWidget * parent); ~DlgAutomation() {} void applyData(); void setData(); diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp index 0fa68b09..5530953b 100644 --- a/kget/dlgConnection.cpp +++ b/kget/dlgConnection.cpp @@ -42,8 +42,8 @@ #include "dlgConnection.h" -DlgConnection::DlgConnection(TQWidget * tqparent) - :DlgConnectionBase(tqparent, "", 0) +DlgConnection::DlgConnection(TQWidget * parent) + :DlgConnectionBase(parent, "", 0) { // TODO: these are not supported yet, so hide them gb_timeout->hide(); diff --git a/kget/dlgConnection.h b/kget/dlgConnection.h index 73229d61..0a8c2b72 100644 --- a/kget/dlgConnection.h +++ b/kget/dlgConnection.h @@ -40,7 +40,7 @@ class DlgConnection : public DlgConnectionBase public: - DlgConnection(TQWidget * tqparent); + DlgConnection(TQWidget * parent); ~DlgConnection() {} void applyData(); void setData(); diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index acd8f6fb..29d11dc0 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -42,8 +42,8 @@ #include "dlgDirectories.h" #include <kapplication.h> -DlgDirectories::DlgDirectories(TQWidget * tqparent) - : DlgDirectoriesBase(tqparent) +DlgDirectories::DlgDirectories(TQWidget * parent) + : DlgDirectoriesBase(parent) { connect( le_ext, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); connect( le_dir, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); diff --git a/kget/dlgDirectories.h b/kget/dlgDirectories.h index 77e19a55..b7484580 100644 --- a/kget/dlgDirectories.h +++ b/kget/dlgDirectories.h @@ -38,7 +38,7 @@ class DlgDirectories : public DlgDirectoriesBase public: - DlgDirectories(TQWidget * tqparent); + DlgDirectories(TQWidget * parent); ~DlgDirectories() {} void applyData(); void setData(); diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp index c37c0023..8c6ded6d 100644 --- a/kget/dlgLimits.cpp +++ b/kget/dlgLimits.cpp @@ -37,8 +37,8 @@ #include "dlgLimits.h" -DlgLimits::DlgLimits(TQWidget * tqparent) - : DlgLimitsBase(tqparent) +DlgLimits::DlgLimits(TQWidget * parent) + : DlgLimitsBase(parent) { // TODO: these are not supported yet, so hide them lb_maxband->hide(); diff --git a/kget/dlgLimits.h b/kget/dlgLimits.h index b8a25a79..dd9b3b35 100644 --- a/kget/dlgLimits.h +++ b/kget/dlgLimits.h @@ -38,7 +38,7 @@ class DlgLimits : public DlgLimitsBase public: - DlgLimits(TQWidget * tqparent); + DlgLimits(TQWidget * parent); ~DlgLimits() {} void applyData(); void setData(); diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index 40ba314d..cc5ebb43 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -49,8 +49,8 @@ #include "dlgPreferences.h" -DlgPreferences::DlgPreferences(TQWidget * tqparent): - KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, tqparent, "DlgPreferences", true) +DlgPreferences::DlgPreferences(TQWidget * parent): + KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, parent, "DlgPreferences", true) { // add pages TQFrame *page = addPage(i18n("Connection")); diff --git a/kget/dlgPreferences.h b/kget/dlgPreferences.h index aa6596f5..e984af73 100644 --- a/kget/dlgPreferences.h +++ b/kget/dlgPreferences.h @@ -49,7 +49,7 @@ class DlgPreferences:public KDialogBase public: - DlgPreferences(TQWidget * tqparent); + DlgPreferences(TQWidget * parent); ~DlgPreferences() {} diff --git a/kget/dlgSystem.cpp b/kget/dlgSystem.cpp index 293b6c7a..af33f966 100644 --- a/kget/dlgSystem.cpp +++ b/kget/dlgSystem.cpp @@ -42,8 +42,8 @@ #include <tqlabel.h> -DlgSystem::DlgSystem(TQWidget * tqparent) - : DlgSystemBase(tqparent) +DlgSystem::DlgSystem(TQWidget * parent) + : DlgSystemBase(parent) { bg_window->hide(); textLabel4->hide(); diff --git a/kget/dlgSystem.h b/kget/dlgSystem.h index b72d479a..2e332bcc 100644 --- a/kget/dlgSystem.h +++ b/kget/dlgSystem.h @@ -38,7 +38,7 @@ class DlgSystem : public DlgSystemBase TQ_OBJECT public: - DlgSystem(TQWidget * tqparent); + DlgSystem(TQWidget * parent); ~DlgSystem() {} void applyData(); diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp index 9aecd6ea..e8f02645 100644 --- a/kget/dockindividual.cpp +++ b/kget/dockindividual.cpp @@ -29,7 +29,7 @@ #include <kpopupmenu.h> #include "dockindividual.h" -DockIndividual::DockIndividual(TQWidget *tqparent, const char *name ) : KSystemTray(tqparent,name) +DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name) { nPic=0; setPixmap( loadIcon("bar0") ); diff --git a/kget/dockindividual.h b/kget/dockindividual.h index ff65e46d..9325226d 100644 --- a/kget/dockindividual.h +++ b/kget/dockindividual.h @@ -37,7 +37,7 @@ class DockIndividual : public KSystemTray { Q_OBJECT TQ_OBJECT public: - DockIndividual(TQWidget *tqparent=0, const char *name=0); + DockIndividual(TQWidget *parent=0, const char *name=0); ~DockIndividual(); int nPic; void setTip(const TQString &); diff --git a/kget/docking.cpp b/kget/docking.cpp index cc5a8044..c637303d 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -40,17 +40,17 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) { - tqparent = _parent; + parent = _parent; setPixmap( loadIcon( "kget_dock" )); // popup menu for right mouse button KPopupMenu *popupMenu = contextMenu(); - tqparent->action("paste_transfer")->plug(popupMenu); - tqparent->action("drop_target")->plug(popupMenu); - tqparent->action("konqueror_integration")->plug(popupMenu); + parent->action("paste_transfer")->plug(popupMenu); + parent->action("drop_target")->plug(popupMenu); + parent->action("konqueror_integration")->plug(popupMenu); popupMenu->insertSeparator(); - tqparent->m_paPreferences->plug(popupMenu); + parent->m_paPreferences->plug(popupMenu); // Enable dropping setAcceptDrops(true); @@ -81,9 +81,9 @@ void DockWidget::dropEvent(TQDropEvent * event) TQString str; if (KURLDrag::decode(event, list)) { - tqparent->addTransfers(list); + parent->addTransfers(list); } else if (TQTextDrag::decode(event, str)) { - tqparent->addTransfer(str); + parent->addTransfer(str); } } @@ -91,7 +91,7 @@ void DockWidget::dropEvent(TQDropEvent * event) void DockWidget::mousePressEvent(TQMouseEvent * e) { if (e->button() == Qt::MidButton) { - tqparent->slotPasteTransfer(); + parent->slotPasteTransfer(); } else { KSystemTray::mousePressEvent(e); } @@ -110,8 +110,8 @@ void DockWidget::changeIcon( const TQString& icon ) } -DynamicTip::DynamicTip( TQWidget * tqparent ) - : TQToolTip( tqparent ) +DynamicTip::DynamicTip( TQWidget * parent ) + : TQToolTip( parent ) { // no explicit initialization needed } diff --git a/kget/docking.h b/kget/docking.h index a18f0eb6..7d866c88 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -41,7 +41,7 @@ class KMainWidget; class DynamicTip : public TQToolTip { public: - DynamicTip( TQWidget * tqparent ); + DynamicTip( TQWidget * parent ); virtual ~DynamicTip() {}//TODO workaround for qt-bug, can be removed after 4.0 void settqStatus( const TQString & _status ); @@ -58,7 +58,7 @@ class DockWidget:public KSystemTray TQ_OBJECT public: - DockWidget(KMainWidget * tqparent); + DockWidget(KMainWidget * parent); ~DockWidget(); /** No descriptions */ void updateToolTip( const TQString& ); @@ -75,7 +75,7 @@ protected: void dropEvent(TQDropEvent *); private: - KMainWidget *tqparent; + KMainWidget *parent; DynamicTip * dtip; }; diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 419de737..5bc91256 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -77,10 +77,10 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() // setup pixmaps - if (!bgnd.tqmask()) - kdError(5001) << "Drop target pixmap has no tqmask!\n"; + if (!bgnd.mask()) + kdError(5001) << "Drop target pixmap has no mask!\n"; else - tqmask = *bgnd.tqmask(); + mask = *bgnd.mask(); setBackgroundPixmap( bgnd ); @@ -144,7 +144,7 @@ DropTarget::mousePressEvent(TQMouseEvent * e) void DropTarget::resizeEvent(TQResizeEvent *) { #ifdef TQ_WS_X11 - XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, tqmask.handle(), ShapeSet); + XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, mask.handle(), ShapeSet); #endif } diff --git a/kget/droptarget.h b/kget/droptarget.h index 84ae0ea2..5c7c932c 100644 --- a/kget/droptarget.h +++ b/kget/droptarget.h @@ -65,7 +65,7 @@ private slots: private: KPopupMenu * popupMenu; - KMainWidget *tqparent; + KMainWidget *parent; bool b_sticky; @@ -75,7 +75,7 @@ private: int size[4]; - TQBitmap tqmask; + TQBitmap mask; public: // Public attributes /** */ // int oldX; diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 295d04b4..69a3cfc1 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -18,8 +18,8 @@ #define COL_MIME 2 #define COL_URL 3 -LinkViewItem::LinkViewItem( TQListView *tqparent, const LinkItem *lnk ) - : TQListViewItem( tqparent ), +LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk ) + : TQListViewItem( parent ), link( lnk ) { TQString file = link->url.fileName(); @@ -37,8 +37,8 @@ LinkViewItem::LinkViewItem( TQListView *tqparent, const LinkItem *lnk ) /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -KGetLinkView::KGetLinkView( TQWidget *tqparent, const char *name ) - : KMainWindow( tqparent, name ) +KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) + : KMainWindow( parent, name ) { setPlainCaption( i18n( "KGet" ) ); diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h index b09e902d..34bf046b 100644 --- a/kget/kget_plug_in/kget_linkview.h +++ b/kget/kget_plug_in/kget_linkview.h @@ -19,7 +19,7 @@ class LinkViewItem : public TQListViewItem { public: - LinkViewItem( TQListView *tqparent, const LinkItem * lnk ); + LinkViewItem( TQListView *parent, const LinkItem * lnk ); const LinkItem *link; }; @@ -30,7 +30,7 @@ class KGetLinkView : public KMainWindow TQ_OBJECT public: - KGetLinkView( TQWidget *tqparent = 0L, const char *name = 0L ); + KGetLinkView( TQWidget *parent = 0L, const char *name = 0L ); ~KGetLinkView(); void setLinks( TQPtrList<LinkItem>& links ); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index 78ef597e..c73406a2 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -44,8 +44,8 @@ #include "links.h" #include "kget_linkview.h" -KGet_plug_in::KGet_plug_in( TQObject* tqparent, const char* name ) - : Plugin( tqparent, name ) +KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) + : Plugin( parent, name ) { TQPixmap pix = KGlobal::iconLoader()->loadIcon("kget", KIcon::MainToolbar); @@ -104,10 +104,10 @@ void KGet_plug_in::slotShowDrop() void KGet_plug_in::slotShowLinks() { - if ( !tqparent() || !tqparent()->inherits( "KHTMLPart" ) ) + if ( !parent() || !parent()->inherits( "KHTMLPart" ) ) return; - KHTMLPart *htmlPart = static_cast<KHTMLPart*>( tqparent() ); + KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() ); KParts::Part *activePart = 0L; if ( htmlPart->partManager() ) { @@ -157,15 +157,15 @@ void KGet_plug_in::slotShowLinks() view->show(); } -KPluginFactory::KPluginFactory( TQObject* tqparent, const char* name ) - : KLibFactory( tqparent, name ) +KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) + : KLibFactory( parent, name ) { s_instance = new KInstance("KPluginFactory"); } -TQObject* KPluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - TQObject *obj = new KGet_plug_in( tqparent, name ); + TQObject *obj = new KGet_plug_in( parent, name ); return obj; } diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index 6cca1390..237c33d9 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -29,7 +29,7 @@ class KGet_plug_in : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KGet_plug_in( TQObject* tqparent = 0, const char* name = 0 ); + KGet_plug_in( TQObject* parent = 0, const char* name = 0 ); KToggleAction *m_paToggleDropTarget ; DCOPClient* p_dcopServer; virtual ~KGet_plug_in(); @@ -46,10 +46,10 @@ class KPluginFactory : public KLibFactory Q_OBJECT TQ_OBJECT public: - KPluginFactory( TQObject *tqparent = 0, const char *name = 0 ); + KPluginFactory( TQObject *parent = 0, const char *name = 0 ); ~KPluginFactory() ; - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index b87743ed..30c6d486 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -77,7 +77,7 @@ static TQString removeHTML(const TQString & str) } -SeparatedLog::SeparatedLog(TQWidget * tqparent):TQWidget(tqparent) +SeparatedLog::SeparatedLog(TQWidget * parent):TQWidget(parent) { idSelected = 0; diff --git a/kget/logwindow.h b/kget/logwindow.h index 46d18439..bc806bb5 100644 --- a/kget/logwindow.h +++ b/kget/logwindow.h @@ -41,7 +41,7 @@ class SeparatedLog:public TQWidget Q_OBJECT TQ_OBJECT public: - SeparatedLog(TQWidget * tqparent); + SeparatedLog(TQWidget * parent); ~SeparatedLog() {} void addLog(uint id, const TQString & filename, const TQString & message); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 2686d168..71a48dec 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -52,8 +52,8 @@ static int defaultColumnWidth[] = { }; -TransferList::TransferList(TQWidget * tqparent, const char *name) - : KListView(tqparent, name) +TransferList::TransferList(TQWidget * parent, const char *name) + : KListView(parent, name) { // enable selection of more than one item setSelectionMode( TQListView::Extended ); @@ -229,7 +229,7 @@ void TransferList::readTransfers(const KURL& file) { TQString tmpFile; - if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)tqparent())) { + if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) { KSimpleConfig config(tmpFile); config.setGroup("Common"); diff --git a/kget/transferlist.h b/kget/transferlist.h index c20ce411..ae3fd6d8 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -61,7 +61,7 @@ class TransferList:public KListView public: - TransferList(TQWidget * tqparent = 0, const char *name = 0); + TransferList(TQWidget * parent = 0, const char *name = 0); virtual ~ TransferList(); Transfer *addTransfer(const KURL & _source, const KURL & _dest, diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index ef1e5f81..398e2f40 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -23,10 +23,10 @@ #include <tqbuffer.h> -Article::Article(NewsSourceBase *tqparent, const TQString &headline, +Article::Article(NewsSourceBase *parent, const TQString &headline, const KURL &address) : XMLNewsArticle(headline, address), - m_parent(tqparent), + m_parent(parent), m_read(false) { } diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 59044942..b4a8ab67 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -37,8 +37,8 @@ NewsIconMgr *NewsIconMgr::self() return m_instance; } -NewsIconMgr::NewsIconMgr(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), DCOPObject("NewsIconMgr"), +NewsIconMgr::NewsIconMgr(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPObject("NewsIconMgr"), m_stdIcon(SmallIcon(TQString::tqfromLatin1("news"))) { connectDCOPSignal("kded", diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index a25bc569..a23696d5 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -34,9 +34,9 @@ #include <dcopclient.h> -KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *tqparent, const char *name) +KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name) : ConfigIface(), DCOPObject("KNewsTicker"), - KPanelApplet(cfgFile, t, actions, tqparent, name), + KPanelApplet(cfgFile, t, actions, parent, name), m_instance(new KInstance("knewsticker")), m_dcopClient(new DCOPClient()), m_cfg(new ConfigAccess(config())), @@ -401,9 +401,9 @@ void KNewsTicker::setupArrowButton() m_arrowButton->setArrowType(at); } -KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *tqparent, const char *name) - : KPopupMenu(tqparent, name), - m_parent(tqparent), +KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *parent, const char *name) + : KPopupMenu(parent, name), + m_parent(parent), m_fullMenu(false) { populateMenu(); @@ -533,13 +533,13 @@ void KNewsTickerMenu::slotOpenArticle(int idx) extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString &configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) { KGlobal::locale()->insertCatalogue(TQString::tqfromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, - tqparent, "knewsticker"); + parent, "knewsticker"); } } diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index b13db0f5..eb07bcbd 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -33,8 +33,8 @@ #include <tqslider.h> #include <tqregexp.h> -CategoryItem::CategoryItem(TQListView *tqparent, const TQString &text) - : TQListViewItem(tqparent, text) +CategoryItem::CategoryItem(TQListView *parent, const TQString &text) + : TQListViewItem(parent, text) { setOpen(true); } @@ -49,10 +49,10 @@ void CategoryItem::setOpen(bool open) TQListViewItem::setOpen(open); } -NewsSourceItem::NewsSourceItem(KNewsTickerConfig *kcm, CategoryItem *tqparent, +NewsSourceItem::NewsSourceItem(KNewsTickerConfig *kcm, CategoryItem *parent, const NewsSourceBase::Data &nsd) - : TQCheckListItem(tqparent, TQString(), TQCheckListItem::CheckBox), - m_parent(tqparent), + : TQCheckListItem(parent, TQString(), TQCheckListItem::CheckBox), + m_parent(parent), m_kcm(kcm) { setData(nsd); @@ -89,8 +89,8 @@ void NewsSourceItem::setIcon(const TQPixmap &pixmap) setPixmap(0, pixmap); } -KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Configuration"), Ok|Close), +KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Configuration"), Ok|Close), m_cfg(cfg), m_child(new KNewsTickerConfigWidget(this)), m_newsIconMgr(NewsIconMgr::self()) @@ -330,8 +330,8 @@ void KNewsTickerConfig::removeNewsSource() m_child->comboFilterNewsSource->removeItem(i); break; } - if (dynamic_cast<NewsSourceItem *>(item) && item->tqparent()->childCount() == 1) - delete item->tqparent(); + if (dynamic_cast<NewsSourceItem *>(item) && item->parent()->childCount() == 1) + delete item->parent(); else delete item; } diff --git a/knewsticker/knewstickerconfig.h b/knewsticker/knewstickerconfig.h index 0af7255e..d0435187 100644 --- a/knewsticker/knewstickerconfig.h +++ b/knewsticker/knewstickerconfig.h @@ -44,7 +44,7 @@ class NewsSourceItem : public TQCheckListItem void setData(const NewsSourceBase::Data &); void setIcon(const TQPixmap &); - TQListViewItem *parentItem() { return TQCheckListItem::tqparent(); } + TQListViewItem *parentItem() { return TQCheckListItem::parent(); } private: TQString m_icon; diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index 6401a13e..7d2a588b 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -104,15 +104,15 @@ void KntSrcFilePropsDlg::slotClickedArticle(TQListBoxItem *item) slotOpenURL(articleItem->article().link().url()); } -TQObject *KntSrcFilePropsFactory::createObject(TQObject *tqparent, const char *, +TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *, const char *classname, const TQStringList &) { if (TQString::tqfromLatin1(classname) == "KPropsDlgPlugin") { - if (!tqparent->inherits("KPropertiesDialog")) + if (!parent->inherits("KPropertiesDialog")) return 0L; - TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(TQT_TQWIDGET(tqparent))); + TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(TQT_TQWIDGET(parent))); return obj; } return 0L; diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index b24e87f9..e92529be 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -128,8 +128,8 @@ private: TQPixmap *m_highlighted; }; -NewsScroller::NewsScroller(TQWidget *tqparent, ConfigAccess *cfg, const char *name) - : TQFrame(tqparent, name, WNoAutoErase), +NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name) + : TQFrame(parent, name, WNoAutoErase), m_cfg(cfg), m_scrollTimer(new TQTimer(this)), m_activeHeadline(0), diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index 3c8df5e9..e78321c7 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -25,8 +25,8 @@ #include <tqtimer.h> #include <tqvbox.h> -SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Downloading Data"), Cancel, Cancel), +SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Downloading Data"), Cancel, Cancel), m_gotSourceFile(false), m_gotIcon(false) { @@ -95,8 +95,8 @@ void SuggestProgressDlg::slotGotIcon(const KURL &url, const TQPixmap &pixmap) done(m_succeeded ? TQDialog::Accepted : TQDialog::Rejected); } -NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *tqparent, const char *name, bool modal, WFlags fl) - : NewsSourceDlg(tqparent, name, modal, fl), +NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *parent, const char *name, bool modal, WFlags fl) + : NewsSourceDlg(parent, name, modal, fl), m_modified(false) { connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), diff --git a/knewsticker/newssourcedlgimpl.h b/knewsticker/newssourcedlgimpl.h index 19552a9a..683217a8 100644 --- a/knewsticker/newssourcedlgimpl.h +++ b/knewsticker/newssourcedlgimpl.h @@ -29,7 +29,7 @@ class SuggestProgressDlg : public KDialogBase TQ_OBJECT public: - SuggestProgressDlg(const KURL &url, TQWidget *tqparent, const char *name = 0); + SuggestProgressDlg(const KURL &url, TQWidget *parent, const char *name = 0); virtual ~SuggestProgressDlg(); XMLNewsSource *xmlSrc() { return m_xmlSrc; } diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp index 3a422759..68c9679e 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp +++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp @@ -37,9 +37,9 @@ #include "kopeteprotocol.h" #include "kopetepluginmanager.h" -AddAccountWizard::AddAccountWizard( TQWidget *tqparent, const char *name, bool modal, bool firstRun ) +AddAccountWizard::AddAccountWizard( TQWidget *parent, const char *name, bool modal, bool firstRun ) : - KWizard(tqparent, name, modal, WDestructiveClose), + KWizard(parent, name, modal, WDestructiveClose), m_accountPage(0), m_proto(0) { diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.h b/kopete/kopete/addaccountwizard/addaccountwizard.h index 0b9bda29..3e3508b1 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.h +++ b/kopete/kopete/addaccountwizard/addaccountwizard.h @@ -45,7 +45,7 @@ class AddAccountWizard : public KWizard TQ_OBJECT public: - AddAccountWizard( TQWidget *tqparent = 0, const char *name = 0 , bool modal = false, bool firstRun = false ); + AddAccountWizard( TQWidget *parent = 0, const char *name = 0 , bool modal = false, bool firstRun = false ); private slots: void slotProtocolListClicked( TQListViewItem *item ); diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index abc0d1f2..9332204e 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -71,8 +71,8 @@ #include "kopeteaccount.h" #include "kopetegroup.h" -AddContactWizard::AddContactWizard( TQWidget *tqparent, const char *name ) -: AddContactWizard_Base( tqparent, name ) +AddContactWizard::AddContactWizard( TQWidget *parent, const char *name ) +: AddContactWizard_Base( parent, name ) { //TQVBox *kabcPageVbox = new TQVBox(this->page(1)); m_addressbookSelectorWidget = new Kopete::UI::AddressBookSelectorWidget(this->page(1)); diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.h b/kopete/kopete/addcontactwizard/addcontactwizard.h index f28334e5..e6ac4949 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.h +++ b/kopete/kopete/addcontactwizard/addcontactwizard.h @@ -53,7 +53,7 @@ class AddContactWizard : public AddContactWizard_Base TQ_OBJECT public: - AddContactWizard( TQWidget *tqparent = 0, const char *name = 0 ); + AddContactWizard( TQWidget *parent = 0, const char *name = 0 ); ~AddContactWizard(); virtual void showPage( TQWidget *page ); diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp index 16dd8a51..ecddf632 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp @@ -30,8 +30,8 @@ #include "fastaddcontactwizard.h" -FastAddContactWizard::FastAddContactWizard( TQWidget *tqparent, const char *name ) -: FastAddContactWizard_Base( tqparent, name ) +FastAddContactWizard::FastAddContactWizard( TQWidget *parent, const char *name ) +: FastAddContactWizard_Base( parent, name ) { m_accountItems.clear(); diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h index aafeba4a..2164f356 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h @@ -50,7 +50,7 @@ class FastAddContactWizard : public FastAddContactWizard_Base Q_OBJECT TQ_OBJECT public: - FastAddContactWizard( TQWidget *tqparent = 0, const char *name = 0 ); + FastAddContactWizard( TQWidget *parent = 0, const char *name = 0 ); ~FastAddContactWizard(); private: TQMap <Kopete::Account*,AddContactPage*> protocolPages; diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index 9ac26ad3..c87d7bda 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -40,8 +40,8 @@ class ChatMembersListWidget::ToolTip : public TQToolTip { public: - ToolTip( KListView *tqparent ) - : TQToolTip( tqparent->viewport() ), m_listView ( tqparent ) + ToolTip( KListView *parent ) + : TQToolTip( parent->viewport() ), m_listView ( parent ) { } @@ -69,8 +69,8 @@ private: //BEGIN ChatMembersListWidget::ContactItem -ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *tqparent, Kopete::Contact *contact ) - : KListViewItem( tqparent ), m_contact( contact ) +ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, Kopete::Contact *contact ) + : KListViewItem( parent ), m_contact( contact ) { TQString nick = m_contact->property(Kopete::Global::Properties::self()->nickName().key()).value().toString(); if ( nick.isEmpty() ) @@ -81,7 +81,7 @@ ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *tqparent connect( m_contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; - settqStatus( tqparent->session()->contactOnlineStatus(m_contact) ); + settqStatus( parent->session()->contactOnlineStatus(m_contact) ); reposition(); } @@ -133,8 +133,8 @@ void ChatMembersListWidget::ContactItem::reposition() //BEGIN ChatMembersListWidget -ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ), m_session( session ) +ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name ) + : KListView( parent, name ), m_session( session ) { // use our own custom tooltips setShowToolTips( false ); diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h index b5ef43a7..322dc807 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.h +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h @@ -37,7 +37,7 @@ class ChatMembersListWidget : public KListView Q_OBJECT TQ_OBJECT public: - ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *tqparent, const char *name = 0 ); + ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 ); virtual ~ChatMembersListWidget(); Kopete::ChatSession *session() { return m_session; } diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 2f16217c..6db38a51 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -213,8 +213,8 @@ private: ChatMessagePart *m_chat; }; -ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *tqparent, const char *name) - : KHTMLPart( tqparent, name ), d( new Private ) +ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, const char *name) + : KHTMLPart( parent, name ), d( new Private ) { d->manager = mgr; diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h index b7f36da1..02551b71 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.h +++ b/kopete/kopete/chatwindow/chatmessagepart.h @@ -44,7 +44,7 @@ public: /** * Create a new ChatMessage Part. */ - ChatMessagePart( Kopete::ChatSession *manager, TQWidget *tqparent, const char *name = 0); + ChatMessagePart( Kopete::ChatSession *manager, TQWidget *parent, const char *name = 0); ~ChatMessagePart(); /** diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp index b6f214d2..1cb9ddf3 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.cpp +++ b/kopete/kopete/chatwindow/chattexteditpart.cpp @@ -31,8 +31,8 @@ #include <tqtimer.h> #include <tqregexp.h> -ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *tqparent, const char *name ) - : KopeteRichTextEditPart( tqparent, name, session->protocol()->capabilities() ), m_session(session) +ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *parent, const char *name ) + : KopeteRichTextEditPart( parent, name, session->protocol()->capabilities() ), m_session(session) { historyPos = -1; diff --git a/kopete/kopete/chatwindow/chattexteditpart.h b/kopete/kopete/chatwindow/chattexteditpart.h index d73209b2..9084d9db 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.h +++ b/kopete/kopete/chatwindow/chattexteditpart.h @@ -49,7 +49,7 @@ class ChatTextEditPart : public KopeteRichTextEditPart Q_OBJECT TQ_OBJECT public: - ChatTextEditPart( Kopete::ChatSession *session, TQWidget *tqparent, const char *name = 0 ); + ChatTextEditPart( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 ); ~ChatTextEditPart(); /** diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 52b82768..0ec5e8ad 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory<ChatWindowPlugin> ChatWindowPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_chatwindow, ChatWindowPluginFactory( "kopete_chatwindow" ) ) -ChatWindowPlugin::ChatWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &) : - Kopete::ViewPlugin( ChatWindowPluginFactory::instance(), tqparent, name ) +ChatWindowPlugin::ChatWindowPlugin(TQObject *parent, const char *name, const TQStringList &) : + Kopete::ViewPlugin( ChatWindowPluginFactory::instance(), parent, name ) {} KopeteView* ChatWindowPlugin::createView( Kopete::ChatSession *manager ) @@ -70,8 +70,8 @@ public: bool visibleMembers; }; -ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *tqparent, const char *name ) - : KDockMainWindow( 0L, name, 0L ), KopeteView( mgr, tqparent ) +ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const char *name ) + : KDockMainWindow( 0L, name, 0L ), KopeteView( mgr, parent ) { d = new KopeteChatViewPrivate; d->isActive = false; @@ -408,9 +408,9 @@ void ChatView::updateChatState( KopeteTabState newState ) } } -void ChatView::setMainWindow( KopeteChatWindow* tqparent ) +void ChatView::setMainWindow( KopeteChatWindow* parent ) { - m_mainWindow = tqparent; + m_mainWindow = parent; } void ChatView::createMembersList() @@ -719,7 +719,7 @@ void ChatView::setCaption( const TQString &text, bool modified ) else updateChatState(); - //Tell the tqparent we changed our caption + //Tell the parent we changed our caption emit( captionChanged( d->isActive ) ); } diff --git a/kopete/kopete/chatwindow/chatview.h b/kopete/kopete/chatwindow/chatview.h index 039918dd..29aa5d17 100644 --- a/kopete/kopete/chatwindow/chatview.h +++ b/kopete/kopete/chatwindow/chatview.h @@ -56,7 +56,7 @@ class ChatView : public KDockMainWindow, public KopeteView Q_OBJECT TQ_OBJECT public: - ChatView( Kopete::ChatSession *manager, ChatWindowPlugin *tqparent, const char *name = 0 ); + ChatView( Kopete::ChatSession *manager, ChatWindowPlugin *parent, const char *name = 0 ); ~ChatView(); /** the state of our chat */ @@ -105,10 +105,10 @@ public: void setCaption( const TQString &text, bool modified ); /** - * Changes the pointer to the chat window. Used to re-tqparent the view - * @param tqparent The new chat window + * Changes the pointer to the chat window. Used to re-parent the view + * @param parent The new chat window */ - void setMainWindow( KopeteChatWindow* tqparent ); + void setMainWindow( KopeteChatWindow* parent ); /** * Returns the message currently in the edit area @@ -120,7 +120,7 @@ public: /** * Sets the current message in the chat window - * @param tqparent The new chat window + * @param parent The new chat window * * Reimplemented from KopeteView */ @@ -301,7 +301,7 @@ signals: void canSendChanged(bool); /** - * Emitted when we re-tqparent ourselves with a new window + * Emitted when we re-parent ourselves with a new window */ void windowCreated(); @@ -412,7 +412,7 @@ private: class ChatWindowPlugin : public Kopete::ViewPlugin { public: - ChatWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &args); + ChatWindowPlugin(TQObject *parent, const char *name, const TQStringList &args); KopeteView* createView( Kopete::ChatSession *manager ); }; diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 7d446e6f..3d8f1bbf 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -32,8 +32,8 @@ #include <kdebug.h> -EmoticonLabel::EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *tqparent, const char *name) - : TQLabel(tqparent,name) +EmoticonLabel::EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *parent, const char *name) + : TQLabel(parent,name) { mText = emoticonText; setMovie( TQMovie(pixmapPath) ); @@ -57,8 +57,8 @@ void EmoticonLabel::mouseReleaseEvent(TQMouseEvent*) emit clicked(mText); } -EmoticonSelector::EmoticonSelector(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +EmoticonSelector::EmoticonSelector(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // kdDebug(14000) << k_funcinfo << "called." << endl; lay = 0L; diff --git a/kopete/kopete/chatwindow/emoticonselector.h b/kopete/kopete/chatwindow/emoticonselector.h index b78201d8..a91a178e 100644 --- a/kopete/kopete/chatwindow/emoticonselector.h +++ b/kopete/kopete/chatwindow/emoticonselector.h @@ -32,7 +32,7 @@ class EmoticonLabel : public TQLabel TQ_OBJECT public: - EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *tqparent=0, const char *name=0); + EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *parent=0, const char *name=0); // ~EmoticonLabel(); signals: @@ -50,7 +50,7 @@ class EmoticonSelector : public TQWidget public: - EmoticonSelector ( TQWidget *tqparent = 0, const char *name = 0 ); + EmoticonSelector ( TQWidget *parent = 0, const char *name = 0 ); // ~EmoticonSelector(); typedef TQValueList<TQMovie*> MovieList; diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index e88c13cc..f2dbd24a 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -164,8 +164,8 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) return myWindow; } -KopeteChatWindow::KopeteChatWindow( TQWidget *tqparent, const char* name ) - : KParts::MainWindow( tqparent, name ) +KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) + : KParts::MainWindow( parent, name ) { m_activeView = 0L; m_popupView = 0L; @@ -406,7 +406,7 @@ void KopeteChatWindow::initActions(void) if( !animIcon.isNull() ) //and another QT bug: it crash if we pause a null movie animIcon.pause(); - // we can't set the tool bar as tqparent, if we do, it will be deleted when we configure toolbars + // we can't set the tool bar as parent, if we do, it will be deleted when we configure toolbars anim = new TQLabel( TQString(), 0L ,"kde toolbar widget" ); anim->setMargin(5); anim->setPixmap( normalIcon ); diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h index b1f9698b..f43fccdb 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.h +++ b/kopete/kopete/chatwindow/kopetechatwindow.h @@ -107,7 +107,7 @@ public: private: // All KopeteChatWindows are created by the window function - KopeteChatWindow( TQWidget *tqparent = 0, const char* name = "KopeteChatWindow" ); + KopeteChatWindow( TQWidget *parent = 0, const char* name = "KopeteChatWindow" ); /** * The window list has changed: diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index c7ee3673..cb1f1395 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -81,8 +81,8 @@ ChatWindowStyleManager *ChatWindowStyleManager::self() return s_self; } -ChatWindowStyleManager::ChatWindowStyleManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), d(new Private()) +ChatWindowStyleManager::ChatWindowStyleManager(TQObject *parent, const char *name) + : TQObject(parent, name), d(new Private()) { kdDebug(14000) << k_funcinfo << endl; loadStyles(); diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h index 712f9bfc..fef09b09 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h @@ -137,7 +137,7 @@ private: * Private constructor(it's a singleton class) * Call loadStyles() to list all avaiable styles. */ - ChatWindowStyleManager(TQObject *tqparent = 0, const char *name = 0); + ChatWindowStyleManager(TQObject *parent = 0, const char *name = 0); static ChatWindowStyleManager *s_self; diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 6f42c374..f278b255 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -62,8 +62,8 @@ typedef KGenericFactory<EmailWindowPlugin> EmailWindowPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_emailwindow, EmailWindowPluginFactory( "kopete_emailwindow" ) ) -EmailWindowPlugin::EmailWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &) : - Kopete::ViewPlugin( EmailWindowPluginFactory::instance(), tqparent, name ) +EmailWindowPlugin::EmailWindowPlugin(TQObject *parent, const char *name, const TQStringList &) : + Kopete::ViewPlugin( EmailWindowPluginFactory::instance(), parent, name ) {} KopeteView* EmailWindowPlugin::createView( Kopete::ChatSession *manager ) @@ -97,8 +97,8 @@ public: KopeteEmoticonAction *actionSmileyMenu; }; -KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowPlugin *tqparent, bool foreignMessage ) - : KParts::MainWindow( ), KopeteView( manager, tqparent ), d( new Private ) +KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowPlugin *parent, bool foreignMessage ) + : KParts::MainWindow( ), KopeteView( manager, parent ), d( new Private ) { TQVBox *v = new TQVBox( this ); setCentralWidget( v ); diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h index 50b1195f..fd398189 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.h +++ b/kopete/kopete/chatwindow/kopeteemailwindow.h @@ -36,7 +36,7 @@ class KopeteEmailWindow : KParts::MainWindow, public KopeteView public: enum WindowMode { Send, Read, Reply }; - KopeteEmailWindow( Kopete::ChatSession *, EmailWindowPlugin *tqparent, bool foreignMessage ); + KopeteEmailWindow( Kopete::ChatSession *, EmailWindowPlugin *parent, bool foreignMessage ); ~KopeteEmailWindow(); virtual Kopete::Message currentMessage(); @@ -95,7 +95,7 @@ private: class EmailWindowPlugin : public Kopete::ViewPlugin { public: - EmailWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &args); + EmailWindowPlugin(TQObject *parent, const char *name, const TQStringList &args); KopeteView* createView( Kopete::ChatSession *manager ); }; diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 0b8d6126..a35dc5bc 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -61,8 +61,8 @@ public: bool m_stickyMenu; }; -KopeteEmoticonAction::KopeteEmoticonAction( TQObject* tqparent, const char* name ) - : KAction( i18n( "Add Smiley" ), 0, tqparent, name ) +KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) + : KAction( i18n( "Add Smiley" ), 0, parent, name ) { d = new KopeteEmoticonActionPrivate; diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h index 7ae3291c..a76dcb0c 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.h +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h @@ -32,7 +32,7 @@ class KopeteEmoticonAction : public KAction TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) public: - KopeteEmoticonAction( TQObject *tqparent = 0, const char *name = 0 ); + KopeteEmoticonAction( TQObject *parent = 0, const char *name = 0 ); virtual ~KopeteEmoticonAction(); KPopupMenu * popupMenu() const; @@ -53,7 +53,7 @@ public: * cannot be clicked, then you should call setDelayed(false). * * On the opposite, if the main action can be clicked, it can only happen - * in a toolbar: in a menu, the tqparent of a submenu can't be activated. + * in a toolbar: in a menu, the parent of a submenu can't be activated. * To get a "normal" menu item when plugged a menu (and no submenu) * use KToolBarPopupAction. */ diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 090c479b..08d19240 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -23,7 +23,7 @@ K_EXPORT_COMPONENT_FACTORY( libkopeterichtexteditpart, KopeteRichTextEditPartFac class KopeteTextEdit : public KTextEdit { public: - KopeteTextEdit( TQWidget *tqparent ) : KTextEdit( tqparent ) {} + KopeteTextEdit( TQWidget *parent ) : KTextEdit( parent ) {} const TQTextCursor * cursor() { return textCursor(); } bool event(TQEvent *event) { @@ -35,21 +35,21 @@ public: } }; -KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( TQT_TQOBJECT(wtqparent), wname ? wname : "rich_text_part" ) +KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) + : KParts::ReadOnlyPart( TQT_TQOBJECT(wparent), wname ? wname : "rich_text_part" ) { - KopeteRichTextEditPart( wtqparent, wname, false ); + KopeteRichTextEditPart( wparent, wname, false ); } -KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *tqparent, const char *name, int capabilities ) - : KParts::ReadOnlyPart( TQT_TQOBJECT(tqparent), name ? name : "rich_text_part" ), +KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) + : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ? name : "rich_text_part" ), m_capabilities( capabilities ), m_richTextEnabled( true ) { // we need an instance setInstance( KopeteRichTextEditPartFactory::instance() ); - editor = new KopeteTextEdit( tqparent ); + editor = new KopeteTextEdit( parent ); editor->setReadOnly( false ); setWidget( editor ); diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h index 45ad1ed5..7492aca2 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.h +++ b/kopete/kopete/chatwindow/krichtexteditpart.h @@ -27,8 +27,8 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart TQ_OBJECT public: - KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, TQObject*, const char*, const TQStringList& ); - KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, int capabilities ); + KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ); + KopeteRichTextEditPart( TQWidget *wparent, const char *wname, int capabilities ); /** * Returns the current editor widget. diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 53f6ec71..4a2b648f 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -61,7 +61,7 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name) +FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) { } @@ -71,12 +71,12 @@ Account* createNewAccount( const TQString &/*accountId*/ ) return 0L; } -AddContactPage* createAddContactWidget( TQWidget */*tqparent*/, Kopete::Account */*account*/) +AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/) { return 0L; } -KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*tqparent */) +KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */) { return 0L; } @@ -86,7 +86,7 @@ KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, class FakeAccount : public Kopete::Account { public: -FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name) +FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) { } diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index bc7a65cb..147c6f17 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -53,8 +53,8 @@ class KopeteAccountLVI : public KListViewItem typedef KGenericFactory<KopeteAccountConfig, TQWidget> KopeteAccountConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_accountconfig, KopeteAccountConfigFactory( "kcm_kopete_accountconfig" ) ) -KopeteAccountConfig::KopeteAccountConfig( TQWidget *tqparent, const char * /* name */, const TQStringList &args ) -: KCModule( KopeteAccountConfigFactory::instance(), tqparent, args ) +KopeteAccountConfig::KopeteAccountConfig( TQWidget *parent, const char * /* name */, const TQStringList &args ) +: KCModule( KopeteAccountConfigFactory::instance(), parent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.h b/kopete/kopete/config/accounts/kopeteaccountconfig.h index 9e939ea6..ad434137 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.h +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.h @@ -36,7 +36,7 @@ class KopeteAccountConfig : public KCModule TQ_OBJECT public: - KopeteAccountConfig(TQWidget *tqparent, const char *name, const TQStringList &args ); + KopeteAccountConfig(TQWidget *parent, const char *name, const TQStringList &args ); public slots: virtual void save(); diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 883d4193..e415d349 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -180,8 +180,8 @@ public: }; // TODO: Someday, this configuration dialog must(not should) use KConfigXT -AppearanceConfig::AppearanceConfig(TQWidget *tqparent, const char* /*name*/, const TQStringList &args ) -: KCModule( KopeteAppearanceConfigFactory::instance(), tqparent, args ) +AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const TQStringList &args ) +: KCModule( KopeteAppearanceConfigFactory::instance(), parent, args ) { d = new Private; @@ -714,17 +714,17 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name){} +FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){} Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;} -AddContactPage* createAddContactWidget( TQWidget */*tqparent*/, Kopete::Account */*account*/){return 0L;} -KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*tqparent */){return 0L;} +AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;} +KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;} }; // This is for style preview. class FakeAccount : public Kopete::Account { public: -FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name){} +FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name){} ~FakeAccount() {} bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;} diff --git a/kopete/kopete/config/appearance/appearanceconfig.h b/kopete/kopete/config/appearance/appearanceconfig.h index 3fe8efb8..9de2b11c 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.h +++ b/kopete/kopete/config/appearance/appearanceconfig.h @@ -35,7 +35,7 @@ class AppearanceConfig : public KCModule friend class KopeteStyleNewStuff; public: - AppearanceConfig( TQWidget *tqparent, const char *name, const TQStringList &args ); + AppearanceConfig( TQWidget *parent, const char *name, const TQStringList &args ); ~AppearanceConfig(); virtual void save(); diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index c8545a82..d14e94f5 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -31,14 +31,14 @@ #include <tqlabel.h> -EditDialog::EditDialog(TQWidget *tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n(name), Ok|Cancel, Ok, true) +EditDialog::EditDialog(TQWidget *parent, const char* name) + : KDialogBase(parent, name, true, i18n(name), Ok|Cancel, Ok, true) { setupDlg(); } -EditDialog::EditDialog(TQWidget *tqparent, const char* name, TQPixmap emot, TQString text, TQString file) - : KDialogBase(tqparent, name, true, i18n(name), Ok|Cancel, Ok, true) +EditDialog::EditDialog(TQWidget *parent, const char* name, TQPixmap emot, TQString text, TQString file) + : KDialogBase(parent, name, true, i18n(name), Ok|Cancel, Ok, true) { setupDlg(); leText->setText(text); @@ -78,8 +78,8 @@ void EditDialog::btnIconClicked() btnIcon->setPixmap(TQPixmap(emoticon)); } -EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *tqparent, TQString theme, const char* name) - : KDialogBase(tqparent, name, true, i18n("Emoticons Editor"), Ok|Cancel, Ok, true) +EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const char* name) + : KDialogBase(parent, name, true, i18n("Emoticons Editor"), Ok|Cancel, Ok, true) { themeName = theme; diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.h b/kopete/kopete/config/appearance/emoticonseditdialog.h index cd7bf7b3..e4435ebf 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.h +++ b/kopete/kopete/config/appearance/emoticonseditdialog.h @@ -32,8 +32,8 @@ class EditDialog : public KDialogBase TQ_OBJECT public: - EditDialog(TQWidget *tqparent, const char* name); - EditDialog(TQWidget *tqparent, const char* name, TQPixmap emot, TQString text, TQString file); + EditDialog(TQWidget *parent, const char* name); + EditDialog(TQWidget *parent, const char* name, TQPixmap emot, TQString text, TQString file); const TQString getText() { return leText->text(); }; const TQString getEmoticon() { return emoticon; }; private slots: @@ -52,7 +52,7 @@ class EmoticonsEditDialog : public KDialogBase TQ_OBJECT public: - EmoticonsEditDialog(TQWidget *tqparent=0, TQString theme = TQString(), const char* name="EmoticonsEditDialog"); + EmoticonsEditDialog(TQWidget *parent=0, TQString theme = TQString(), const char* name="EmoticonsEditDialog"); void addEmoticon(TQString emo, TQString text, bool copy); private slots: diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp index 7da37fac..eef1ccb0 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp +++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp @@ -33,14 +33,14 @@ class TooltipItem : public KListViewItem { public: - TooltipItem(KListView *tqparent, const TQString& label, const TQString& propertyName) - : KListViewItem(tqparent, label), + TooltipItem(KListView *parent, const TQString& label, const TQString& propertyName) + : KListViewItem(parent, label), mPropName(propertyName) { } - TooltipItem(KListView *tqparent, TQListViewItem *item, const TQString& label, const TQString& propertyName) - : KListViewItem(tqparent, item, label), + TooltipItem(KListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName) + : KListViewItem(parent, item, label), mPropName(propertyName) { } @@ -52,8 +52,8 @@ class TooltipItem : public KListViewItem -TooltipEditDialog::TooltipEditDialog(TQWidget *tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Tooltip Editor"), Ok|Cancel, Ok, true) +TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) + : KDialogBase(parent, name, true, i18n("Tooltip Editor"), Ok|Cancel, Ok, true) { mMainWidget = new TooltipEditWidget(this, "TooltipEditDialog::mMainWidget"); setMainWidget(mMainWidget); diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.h b/kopete/kopete/config/appearance/tooltipeditdialog.h index f828278b..35635359 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.h +++ b/kopete/kopete/config/appearance/tooltipeditdialog.h @@ -28,7 +28,7 @@ class TooltipEditDialog : public KDialogBase TQ_OBJECT public: - TooltipEditDialog(TQWidget *tqparent=0, const char* name="ToolTipEditDialog"); + TooltipEditDialog(TQWidget *parent=0, const char* name="ToolTipEditDialog"); private slots: void slotUnusedSelected(TQListViewItem *); diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp index 38bb3c1e..4f8bafc0 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp +++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp @@ -43,8 +43,8 @@ typedef KGenericFactory<AVDeviceConfig, TQWidget> KopeteAVDeviceConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_avdeviceconfig, KopeteAVDeviceConfigFactory( "kcm_kopete_avdeviceconfig" ) ) -AVDeviceConfig::AVDeviceConfig(TQWidget *tqparent, const char * name , const TQStringList &args) - : KCModule( KopeteAVDeviceConfigFactory::instance(), tqparent, args ) +AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args) + : KCModule( KopeteAVDeviceConfigFactory::instance(), parent, args ) { kdDebug() << "kopete:config (avdevice): KopeteAVDeviceConfigFactory::instance() called. " << endl; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.h b/kopete/kopete/config/avdevice/avdeviceconfig.h index 4fc2fe04..eb267c44 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.h +++ b/kopete/kopete/config/avdevice/avdeviceconfig.h @@ -42,7 +42,7 @@ class AVDeviceConfig : public KCModule Q_OBJECT TQ_OBJECT public: - AVDeviceConfig(TQWidget *tqparent, const char * name , const TQStringList &args); + AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args); ~AVDeviceConfig(); virtual void save(); diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index bfc823fe..b133a64b 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -48,8 +48,8 @@ typedef KGenericFactory<BehaviorConfig, TQWidget> KopeteBehaviorConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_behaviorconfig, KopeteBehaviorConfigFactory( "kcm_kopete_behaviorconfig" ) ) -BehaviorConfig::BehaviorConfig(TQWidget *tqparent, const char * /* name */, const TQStringList &args) : - KCModule( KopeteBehaviorConfigFactory::instance(), tqparent, args ) +BehaviorConfig::BehaviorConfig(TQWidget *parent, const char * /* name */, const TQStringList &args) : + KCModule( KopeteBehaviorConfigFactory::instance(), parent, args ) { (new TQVBoxLayout(this))->setAutoAdd(true); mBehaviorTabCtl = new TQTabWidget(this, "mBehaviorTabCtl"); diff --git a/kopete/kopete/config/behavior/behaviorconfig.h b/kopete/kopete/config/behavior/behaviorconfig.h index c4f4c33b..4f01c943 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.h +++ b/kopete/kopete/config/behavior/behaviorconfig.h @@ -38,7 +38,7 @@ class BehaviorConfig : public KCModule TQ_OBJECT public: - BehaviorConfig(TQWidget *tqparent, const char * name , const TQStringList &args) ; + BehaviorConfig(TQWidget *parent, const char * name , const TQStringList &args) ; virtual void save(); virtual void load(); diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.cpp b/kopete/kopete/config/identity/globalidentitiesmanager.cpp index 00c4aadc..41fbb3b6 100644 --- a/kopete/kopete/config/identity/globalidentitiesmanager.cpp +++ b/kopete/kopete/config/identity/globalidentitiesmanager.cpp @@ -49,8 +49,8 @@ GlobalIdentitiesManager *GlobalIdentitiesManager::self() return s_self; } -GlobalIdentitiesManager::GlobalIdentitiesManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +GlobalIdentitiesManager::GlobalIdentitiesManager(TQObject *parent, const char *name) + : TQObject(parent, name) { d = new Private; } diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.h b/kopete/kopete/config/identity/globalidentitiesmanager.h index 9efc2204..a253bdc8 100644 --- a/kopete/kopete/config/identity/globalidentitiesmanager.h +++ b/kopete/kopete/config/identity/globalidentitiesmanager.h @@ -121,7 +121,7 @@ public: TQMap<TQString, Kopete::MetaContact*> getGlobalIdentitiesList(); private: - GlobalIdentitiesManager(TQObject *tqparent = 0, const char *name = 0); + GlobalIdentitiesManager(TQObject *parent = 0, const char *name = 0); /** * @brief Return a XML representation of the global identities list. diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index ec727e98..97bc2bcc 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -85,7 +85,7 @@ public: typedef KGenericFactory<KopeteIdentityConfig, TQWidget> KopeteIdentityConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_identityconfig, KopeteIdentityConfigFactory( "kcm_kopete_identityconfig" ) ) -KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *tqparent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), tqparent, args) +KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), parent, args) { d = new Private; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h index 9385b866..c74ae463 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.h +++ b/kopete/kopete/config/identity/kopeteidentityconfig.h @@ -38,7 +38,7 @@ class KopeteIdentityConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KopeteIdentityConfig(TQWidget *tqparent, const char *name, const TQStringList &args ); + KopeteIdentityConfig(TQWidget *parent, const char *name, const TQStringList &args ); ~KopeteIdentityConfig(); public slots: diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.cpp b/kopete/kopete/config/plugins/kopetepluginconfig.cpp index 973eadd7..7f790a0b 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.cpp +++ b/kopete/kopete/config/plugins/kopetepluginconfig.cpp @@ -39,9 +39,9 @@ KopetePluginConfig::~KopetePluginConfig() delete d; } -KopetePluginConfig::KopetePluginConfig( TQWidget *tqparent, const char *name ) +KopetePluginConfig::KopetePluginConfig( TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Configure Plugins" ), /*Help |*/ Cancel | Apply | Ok | User1, - Ok, tqparent, name, false, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) + Ok, parent, name, false, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) { d = new KopetePluginConfigPrivate; showButton( User1, false ); diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.h b/kopete/kopete/config/plugins/kopetepluginconfig.h index 5c1a57a5..dc5d1736 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.h +++ b/kopete/kopete/config/plugins/kopetepluginconfig.h @@ -33,7 +33,7 @@ class KopetePluginConfig : public KDialogBase TQ_OBJECT public: - KopetePluginConfig( TQWidget *tqparent, const char *name = 0L ); + KopetePluginConfig( TQWidget *parent, const char *name = 0L ); ~KopetePluginConfig(); void apply(); diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index 95333c92..8c9deb30 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -33,10 +33,10 @@ #include "customnotificationprops.h" -CustomNotificationProps::CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name ) -: TQObject( tqparent, name ) +CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name ) +: TQObject( parent, name ) { - m_notifyWidget = new CustomNotificationWidget( tqparent, "notificationWidget" ); + m_notifyWidget = new CustomNotificationWidget( parent, "notificationWidget" ); m_item = item; TQString path = "kopete/eventsrc"; diff --git a/kopete/kopete/contactlist/customnotificationprops.h b/kopete/kopete/contactlist/customnotificationprops.h index 9008123d..6da6f1f2 100644 --- a/kopete/kopete/contactlist/customnotificationprops.h +++ b/kopete/kopete/contactlist/customnotificationprops.h @@ -32,7 +32,7 @@ class CustomNotificationProps : public TQObject Q_OBJECT TQ_OBJECT public: - CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name = 0 ); + CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name = 0 ); ~CustomNotificationProps() {} void dumpData(); void resetEventWidgets(); diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/kabcexport.cpp index 7d380c9a..ae9b7771 100644 --- a/kopete/kopete/contactlist/kabcexport.cpp +++ b/kopete/kopete/contactlist/kabcexport.cpp @@ -48,15 +48,15 @@ class ContactLVI : public TQCheckListItem { public: - ContactLVI ( Kopete::MetaContact * mc, TQListView * tqparent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( tqparent, text, tt ), mc( mc ) + ContactLVI ( Kopete::MetaContact * mc, TQListView * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( parent, text, tt ), mc( mc ) { } Kopete::MetaContact * mc; TQString uid; }; // ctor populates the resource list and contact list, and enables the next button on the first page -KabcExportWizard::KabcExportWizard( TQWidget *tqparent, const char *name ) - : KabcExportWizard_Base( tqparent, name ) +KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) + : KabcExportWizard_Base( parent, name ) { connect( m_addrBooks, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( slotResourceSelectionChanged( TQListBoxItem * ) ) ); diff --git a/kopete/kopete/contactlist/kabcexport.h b/kopete/kopete/contactlist/kabcexport.h index 74029796..3e5ff965 100644 --- a/kopete/kopete/contactlist/kabcexport.h +++ b/kopete/kopete/contactlist/kabcexport.h @@ -38,7 +38,7 @@ class KabcExportWizard : public KabcExportWizard_Base Q_OBJECT TQ_OBJECT public: - KabcExportWizard( TQWidget *tqparent = 0, const char *name = 0 ); + KabcExportWizard( TQWidget *parent = 0, const char *name = 0 ); ~KabcExportWizard(); public slots: void accept(); diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index eda83970..b3b6d630 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -35,10 +35,10 @@ #include "kopeteaddrbookexport.h" #include "kopeteaddrbookexportui.h" -KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ) : TQObject( tqparent ) +KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ) : TQObject( parent ) { // instantiate dialog and populate widgets - mParent = tqparent; + mParent = parent; mAddressBook = KABC::StdAddressBook::self(); mMetaContact = mc; } diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h index 0bc79dbb..0190e8b7 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.h +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h @@ -40,7 +40,7 @@ class MetaContact; class KopeteAddressBookExport : public TQObject { public: - KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ); + KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ); ~KopeteAddressBookExport(); /** diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 414d8c22..d95e4cb1 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -381,7 +381,7 @@ static TQListViewItem *nextItem( TQListViewItem *item ) if ( TQListViewItem *it = item->firstChild() ) return it; while ( item && !item->nextSibling() ) - item = item->tqparent(); + item = item->parent(); if ( !item ) return 0; return item->nextSibling(); @@ -389,8 +389,8 @@ static TQListViewItem *nextItem( TQListViewItem *item ) -KopeteContactListView::KopeteContactListView( TQWidget *tqparent, const char *name ) - : Kopete::UI::ListView::ListView( tqparent, name ) +KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name ) + : Kopete::UI::ListView::ListView( parent, name ) { d = new KopeteContactListViewPrivate; m_undo=0L; @@ -999,17 +999,17 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta } } -void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ) +void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ) { int r = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "<qt>Would you like to add <b>%1</b> to your contact list as a child contact of <b>%2</b>?</qt>" ) - .tqarg( contact->contactId(), tqparent->displayName() ), + .tqarg( contact->contactId(), parent->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); if( r == KMessageBox::Yes ) { - contact->setMetaContact(tqparent); + contact->setMetaContact(parent); UndoItem *u=new UndoItem; u->type=UndoItem::ContactAdd; @@ -1064,13 +1064,13 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, bool KopeteContactListView::acceptDrag(TQDropEvent *e) const { TQListViewItem *source=currentItem(); - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *afterme; // Due to a little design problem in KListView::findDrop() we can't // call it directly from a const method until KDE 4.0, but as the // method is in fact const we can of course get away with a // const_cast... - const_cast<KopeteContactListView *>( this )->findDrop( e->pos(), tqparent, afterme ); + const_cast<KopeteContactListView *>( this )->findDrop( e->pos(), parent, afterme ); KopeteMetaContactLVI *dest_metaLVI=dynamic_cast<KopeteMetaContactLVI*>(afterme); @@ -1191,12 +1191,12 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const return false; } -void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, +void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after) { //Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. //This woraround allow us to keep the highlight of the item, and give always a correct position - tqparent=0L; + parent=0L; TQPoint p (contentsToViewport(pos)); after=itemAt(p); } @@ -1676,7 +1676,7 @@ void KopeteContactListView::slotAddContact() Kopete::ContactList::self()->selectedMetaContacts().first(); Kopete::Group *group = Kopete::ContactList::self()->selectedGroups().first(); - Kopete::Account *account = dynamic_cast<Kopete::Account*>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent() ); + Kopete::Account *account = dynamic_cast<Kopete::Account*>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent() ); if ( ( metacontact && metacontact->isTemporary() ) || (group && group->type()!=Kopete::Group::Normal ) ) diff --git a/kopete/kopete/contactlist/kopetecontactlistview.h b/kopete/kopete/contactlist/kopetecontactlistview.h index ff4d523d..6a4e2937 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.h +++ b/kopete/kopete/contactlist/kopetecontactlistview.h @@ -62,7 +62,7 @@ class KopeteContactListView : public Kopete::UI::ListView::ListView TQ_OBJECT public: - KopeteContactListView( TQWidget *tqparent = 0, const char *name = 0 ); + KopeteContactListView( TQWidget *parent = 0, const char *name = 0 ); ~KopeteContactListView(); /** @@ -107,7 +107,7 @@ protected: * Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. * This woraround allow us to keep the highlight of the item, and give always a correct position */ - virtual void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); + virtual void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); /** * The selected items have changed; update our actions to show what's possible. @@ -150,7 +150,7 @@ private slots: void slotContactStatusChanged( Kopete::MetaContact *mc ); - void slotDropped(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem*); + void slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListViewItem*); void slotShowAddContactDialog(); void slotNewMessageEvent(Kopete::MessageEvent *); @@ -209,7 +209,7 @@ private: void moveDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *from, Kopete::Group *to ); void addDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *group ); - void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ); + void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ); void addDraggedContactByInfo( const TQString &protocolId, const TQString &accountId, const TQString &contactId, TQListViewItem *after ); diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp index 1e415884..9b954951 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp +++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp @@ -30,8 +30,8 @@ #include "kopetegroup.h" KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const KShortcut &cut, const TQObject *receiver, - const char *slot, TQObject *tqparent, const char *name ) -: KListAction( text, pix, cut, tqparent, name ) + const char *slot, TQObject *parent, const char *name ) +: KListAction( text, pix, cut, parent, name ) { connect( this, TQT_SIGNAL( activated() ), receiver, slot ); diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index 75508159..d952e728 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -68,15 +68,15 @@ private: } // END namespace UI } // END namespace Kopete -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *tqparent, const char *name ) -: Kopete::UI::ListView::Item( tqparent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *parent, const char *name ) +: Kopete::UI::ListView::Item( parent, group_, name ) { m_group = group_; initLVI(); } -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *tqparent, const char *name ) - : Kopete::UI::ListView::Item( tqparent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *parent, const char *name ) + : Kopete::UI::ListView::Item( parent, group_, name ) { m_group = group_; initLVI(); diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.h b/kopete/kopete/contactlist/kopetegroupviewitem.h index 091e791d..19b24cfd 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.h +++ b/kopete/kopete/contactlist/kopetegroupviewitem.h @@ -37,8 +37,8 @@ class KopeteGroupViewItem : public Kopete::UI::ListView::Item Q_OBJECT TQ_OBJECT public: - KopeteGroupViewItem( Kopete::Group *group , TQListView *tqparent, const char *name = 0 ); - KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *tqparent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListView *parent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *parent, const char *name = 0 ); ~KopeteGroupViewItem(); Kopete::Group * group() const; diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index f3c727ec..39b00849 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -65,8 +65,8 @@ const char MC_AW[] = "metacontact_away"; const char MC_UNK[] = "metacontact_unknown"; -KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name) -: KDialogBase(tqparent, name, true, i18n("Properties of Group %1").tqarg(gvi->group()->displayName()), Ok|Cancel, Ok, false) +KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, i18n("Properties of Group %1").tqarg(gvi->group()->displayName()), Ok|Cancel, Ok, false) { mainWidget = new KopeteGVIPropsWidget(this, "mainWidget"); mainWidget->icnbOpen->setIconSize(KIcon::SizeSmall); @@ -145,8 +145,8 @@ void KopeteGVIProps::slotIconChanged() // ============================================================================= -KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *tqparent, const char *name) -: KDialogBase(tqparent, name, true, i18n("Properties of Meta Contact %1").tqarg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) +KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, i18n("Properties of Meta Contact %1").tqarg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) { m_countPhotoCapable = 0; mainWidget = new KopeteMetaLVIPropsWidget( this, "mainWidget" ); diff --git a/kopete/kopete/contactlist/kopetelviprops.h b/kopete/kopete/contactlist/kopetelviprops.h index d674f0ad..320c729e 100644 --- a/kopete/kopete/contactlist/kopetelviprops.h +++ b/kopete/kopete/contactlist/kopetelviprops.h @@ -46,7 +46,7 @@ class KopeteGVIProps: public KDialogBase TQ_OBJECT public: - KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name=0L); + KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name=0L); ~KopeteGVIProps(); private: @@ -68,7 +68,7 @@ class KopeteMetaLVIProps: public KDialogBase TQ_OBJECT public: - KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *tqparent, const char *name=0L); + KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *parent, const char *name=0L); ~KopeteMetaLVIProps(); private: diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index c7529f44..bdf8c362 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -167,22 +167,22 @@ public: TQPtrList<Kopete::MessageEvent> events; }; -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ) -: ListView::Item( tqparent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ) +: ListView::Item( parent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) { m_metaContact = contact; m_isTopLevel = false; - m_parentGroup = tqparent; + m_parentGroup = parent; m_parentView = 0L; initLVI(); - tqparent->refreshDisplayName(); + parent->refreshDisplayName(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ) -: ListView::Item( tqparent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ) +: ListView::Item( parent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) { m_metaContact = contact; @@ -193,15 +193,15 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQList initLVI(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ) -: ListView::Item( tqparent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ) +: ListView::Item( parent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) { m_metaContact = contact; m_isTopLevel = true; m_parentGroup = 0L; - m_parentView = tqparent; + m_parentView = parent; initLVI(); } @@ -280,13 +280,13 @@ void KopeteMetaContactLVI::movedToDifferentGroup() // create a spacer if wanted // I assume that the safety property that allows the delete in slotConfigChanged holds here - Will delete d->spacerBox->component( 0 ); - if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); } - KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::tqparent()); + KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::parent()); if ( group_item ) { m_isTopLevel = false; @@ -658,7 +658,7 @@ void KopeteMetaContactLVI::slotConfigChanged() // create a spacer if wanted delete d->spacerBox->component( 0 ); - if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index bda1660c..9dcdcc4f 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -56,9 +56,9 @@ class KopeteMetaContactLVI : public Kopete::UI::ListView::Item TQ_OBJECT public: - KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ); ~KopeteMetaContactLVI(); /** @@ -73,12 +73,12 @@ public: bool isTopLevel() const; /** - * tqparent when top-level + * parent when top-level */ TQListView *parentView() const { return m_parentView; }; /** - * tqparent when not top-level + * parent when not top-level */ KopeteGroupViewItem *parentGroup() const { return m_parentGroup; }; diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp index b4dc9569..6595e237 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include "kopetestatusgroupviewitem.h" -KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name ) - : TQListViewItem(tqparent,name) +KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name ) + : TQListViewItem(parent,name) { m_status = status_; } diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h index d3cc8281..3d71375e 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h @@ -30,7 +30,7 @@ class KopeteStatusGroupViewItem : public TQListViewItem { public: - KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name=0); + KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name=0); ~KopeteStatusGroupViewItem(); private: diff --git a/kopete/kopete/kopeteaccountstatusbaricon.cpp b/kopete/kopete/kopeteaccountstatusbaricon.cpp index f493755e..a47bcff0 100644 --- a/kopete/kopete/kopeteaccountstatusbaricon.cpp +++ b/kopete/kopete/kopeteaccountstatusbaricon.cpp @@ -22,12 +22,12 @@ //#include <kdebug.h> -KopeteAccountStatusBarIcon::KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *tqparent, +KopeteAccountStatusBarIcon::KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *parent, const char *name ) -: TQLabel( tqparent, name ) +: TQLabel( parent, name ) { // kdDebug(14000) << "[KopeteAccountStatusBarIcon] Setting Initial Protocol Icon" << endl; - //setMask(initialPixmap->tqmask()); + //setMask(initialPixmap->mask()); //setPixmap( Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, proto, 0, "status_unknown", TQString(), TQString() ).protocolIcon() ); //setPixmap( proto->status().protocolIcon() ); diff --git a/kopete/kopete/kopeteaccountstatusbaricon.h b/kopete/kopete/kopeteaccountstatusbaricon.h index a660a63c..bd867351 100644 --- a/kopete/kopete/kopeteaccountstatusbaricon.h +++ b/kopete/kopete/kopeteaccountstatusbaricon.h @@ -39,7 +39,7 @@ public: /** * Create a statusbar icon. */ - KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *tqparent, + KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *parent, const char *name = 0 ); ~KopeteAccountStatusBarIcon(); diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index 3ff73e10..a42a4e8e 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -39,13 +39,13 @@ #include "systemtray.h" #include "kopeteprefs.h" -KopeteActiveLabel::KopeteActiveLabel( TQWidget *tqparent, const char *name ) - : KActiveLabel( tqparent, name ) +KopeteActiveLabel::KopeteActiveLabel( TQWidget *parent, const char *name ) + : KActiveLabel( parent, name ) { } -KopeteActiveLabel::KopeteActiveLabel( const TQString& text, TQWidget *tqparent, - const char *name ) : KActiveLabel( text, tqparent, name ) +KopeteActiveLabel::KopeteActiveLabel( const TQString& text, TQWidget *parent, + const char *name ) : KActiveLabel( text, parent, name ) { } @@ -136,7 +136,7 @@ void KopeteBalloon::setAnchor(const TQPoint &anchor) void KopeteBalloon::updateMask() { - TQRegion tqmask(10, 10, width() - 20, height() - 20); + TQRegion mask(10, 10, width() - 20, height() - 20); TQPoint corners[8] = { TQPoint(width() - 50, 10), @@ -156,7 +156,7 @@ void KopeteBalloon::updateMask() i * 16 * 90, 16 * 90); corner.resize(corner.size() + 1); corner.setPoint(corner.size() - 1, corners[i + 4]); - tqmask -= corner; + mask -= corner; } // get screen-tqgeometry for screen our anchor is on @@ -173,8 +173,8 @@ void KopeteBalloon::updateMask() arrow.setPoint(2, TQPoint(right ? width() - 30 : 30, bottom ? height() - 10 : 10)); arrow.setPoint(3, arrow[0]); - tqmask += arrow; - setMask(tqmask); + mask += arrow; + setMask(mask); move( right ? mAnchor.x() - width() : ( mAnchor.x() < 0 ? 0 : mAnchor.x() ), bottom ? mAnchor.y() - height() : ( mAnchor.y() < 0 ? 0 : mAnchor.y() ) ); diff --git a/kopete/kopete/kopeteballoon.h b/kopete/kopete/kopeteballoon.h index 7b02404b..103c86c4 100644 --- a/kopete/kopete/kopeteballoon.h +++ b/kopete/kopete/kopeteballoon.h @@ -34,8 +34,8 @@ class KopeteActiveLabel : public KActiveLabel TQ_OBJECT public: - KopeteActiveLabel( TQWidget *tqparent = 0, const char* name = 0 ); - KopeteActiveLabel( const TQString& text, TQWidget *tqparent = 0, const char* name = 0 ); + KopeteActiveLabel( TQWidget *parent = 0, const char* name = 0 ); + KopeteActiveLabel( const TQString& text, TQWidget *parent = 0, const char* name = 0 ); public slots: virtual void openLink( const TQString &link ); diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index 9df7052c..4e752fa8 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -42,8 +42,8 @@ #include "kopetemetacontact.h" -ClickableLabel::ClickableLabel(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name) +ClickableLabel::ClickableLabel(TQWidget *parent, const char *name) + : TQLabel(parent, name) { setCursor(TQCursor(TQt::PointingHandCursor)); } @@ -73,8 +73,8 @@ public: TQString lastNickname; }; -KopeteEditGlobalIdentityWidget::KopeteEditGlobalIdentityWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KopeteEditGlobalIdentityWidget::KopeteEditGlobalIdentityWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { d = new Private; diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.h b/kopete/kopete/kopeteeditglobalidentitywidget.h index 00f1d7fc..82ad3ca7 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.h +++ b/kopete/kopete/kopeteeditglobalidentitywidget.h @@ -35,12 +35,12 @@ class KopeteEditGlobalIdentityWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KopeteEditGlobalIdentityWidget(TQWidget *tqparent = 0, const char *name = 0); + KopeteEditGlobalIdentityWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KopeteEditGlobalIdentityWidget(); public slots: /** - * This slot is called when the "tqparent" toolbar change its icon size. + * This slot is called when the "parent" toolbar change its icon size. */ void iconSizeChanged(); /** @@ -89,7 +89,7 @@ class ClickableLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - ClickableLabel(TQWidget *tqparent = 0, const char *name = 0); + ClickableLabel(TQWidget *parent = 0, const char *name = 0); signals: void clicked(); diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index f5654947..7ec4258d 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -82,8 +82,8 @@ #include "kopeteeditglobalidentitywidget.h" //BEGIN GlobalStatusMessageIconLabel -GlobalStatusMessageIconLabel::GlobalStatusMessageIconLabel(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name) +GlobalStatusMessageIconLabel::GlobalStatusMessageIconLabel(TQWidget *parent, const char *name) + : TQLabel(parent, name) {} void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) @@ -120,8 +120,8 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) * (session) quit. */ -KopeteWindow::KopeteWindow( TQWidget *tqparent, const char *name ) -: KMainWindow( tqparent, name, WType_TopLevel ) +KopeteWindow::KopeteWindow( TQWidget *parent, const char *name ) +: KMainWindow( parent, name, WType_TopLevel ) { // Applications should ensure that their StatusBar exists before calling createGUI() // so that the StatusBar is always correctly positioned when KDE is configured to use diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 30bd502b..7d881c79 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -64,7 +64,7 @@ class KopeteWindow : public KMainWindow TQ_OBJECT public: - KopeteWindow ( TQWidget *tqparent = 0, const char *name = 0 ); + KopeteWindow ( TQWidget *parent = 0, const char *name = 0 ); ~KopeteWindow(); virtual bool eventFilter( TQObject* o, TQEvent* e ); @@ -268,7 +268,7 @@ class GlobalStatusMessageIconLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - GlobalStatusMessageIconLabel(TQWidget *tqparent = 0, const char *name = 0); + GlobalStatusMessageIconLabel(TQWidget *parent = 0, const char *name = 0); protected: void mouseReleaseEvent(TQMouseEvent *event); diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 1a0dbc30..7982d01e 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -41,16 +41,16 @@ KopeteSystemTray* KopeteSystemTray::s_systemTray = 0L; -KopeteSystemTray* KopeteSystemTray::systemTray( TQWidget *tqparent, const char* name ) +KopeteSystemTray* KopeteSystemTray::systemTray( TQWidget *parent, const char* name ) { if( !s_systemTray ) - s_systemTray = new KopeteSystemTray( tqparent, name ); + s_systemTray = new KopeteSystemTray( parent, name ); return s_systemTray; } -KopeteSystemTray::KopeteSystemTray(TQWidget* tqparent, const char* name) - : KSystemTray(tqparent,name) +KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name) + : KSystemTray(parent,name) { // kdDebug(14010) << "Creating KopeteSystemTray" << endl; TQToolTip::add( this, kapp->aboutData()->shortDescription() ); @@ -72,15 +72,15 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* tqparent, const char* name) this, TQT_SLOT(slotReevaluateAccountStates())); // the slot called by default by the quit action, KSystemTray::maybeQuit(), - // just closes the tqparent window, which is hard to distinguish in that window's closeEvent() + // just closes the parent window, which is hard to distinguish in that window's closeEvent() // from a click on the window's close widget // in the quit case, we want to quit the application - // in the close widget click case, we only want to hide the tqparent window + // in the close widget click case, we only want to hide the parent window // so instead, we make it call our general purpose quit slot on the window, which causes a window close and everything else we need // KDE4 - app will have to listen for quitSelected instead KAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); - KopeteWindow *myParent = static_cast<KopeteWindow *>( tqparent ); + KopeteWindow *myParent = static_cast<KopeteWindow *>( parent ); connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) ); //setPixmap(mKopeteIcon); diff --git a/kopete/kopete/systemtray.h b/kopete/kopete/systemtray.h index 0eaca276..3f5d3fb9 100644 --- a/kopete/kopete/systemtray.h +++ b/kopete/kopete/systemtray.h @@ -48,7 +48,7 @@ public: /** * Retrieve the system tray instance */ - static KopeteSystemTray* systemTray( TQWidget* tqparent = 0, const char* name = 0 ); + static KopeteSystemTray* systemTray( TQWidget* parent = 0, const char* name = 0 ); ~KopeteSystemTray(); @@ -80,7 +80,7 @@ private slots: void addBalloon(); private: - KopeteSystemTray( TQWidget* tqparent, const char* name ); + KopeteSystemTray( TQWidget* parent, const char* name ); TQString squashMessage( const Kopete::Message& msgText ); void removeBalloonEvent(Kopete::MessageEvent *); diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index a85589ab..d8d91602 100644 --- a/kopete/libkopete/avdevice/qvideo.cpp +++ b/kopete/libkopete/avdevice/qvideo.cpp @@ -64,7 +64,7 @@ unsigned int QVideo::bytesppForFormat(ImageFormat fmt) bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel) { XVisualInfo *vi_in, vi_out; - long tqmask = VisualScreenMask; + long mask = VisualScreenMask; int nvis = 0; ImageFormat p = FORMAT_NONE; @@ -72,7 +72,7 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b int d = 0; vi_out.screen = TQPaintDevice::x11AppScreen(); - vi_in = XGetVisualInfo(qt_xdisplay(), tqmask, &vi_out, &nvis); + vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 7f4c677d..113aa16d 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -43,7 +43,7 @@ extern "C" { class QVideoStreamGLWidget : public TQGLWidget { public: - QVideoStreamGLWidget(TQWidget* tqparent = 0, const char* name = 0); + QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0); virtual ~QVideoStreamGLWidget(); void setInputSize(const TQSize& sz); @@ -532,10 +532,10 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img) // --------------------------------------------------------------------------------------- #ifdef HAVE_GL -QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* tqparent, const char* name) - : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), tqparent, name), +QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) + : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name), _tex(0), - _w(tqparent), + _w(parent), _glfun(false) { kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl; diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp index b17da677..c394af0f 100644 --- a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kdialog.h> -KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent, - const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) +KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent, + const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox); @@ -40,9 +40,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog() { } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -61,9 +61,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ return rect; } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); @@ -83,9 +83,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in return rect; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -103,9 +103,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ return image; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) { - KPixmapRegionSelectorDialog dialog(tqparent); + KPixmapRegionSelectorDialog dialog(parent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.h b/kopete/libkopete/compat/kpixmapregionselectordialog.h index fbf2db6a..ffc5551e 100644 --- a/kopete/libkopete/compat/kpixmapregionselectordialog.h +++ b/kopete/libkopete/compat/kpixmapregionselectordialog.h @@ -47,7 +47,7 @@ public: * later the setPixmap method of the KPixmapRegionSelectorWidget widget of * the new object. */ - KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L, + KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog @@ -68,7 +68,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -78,7 +78,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -87,7 +87,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -97,7 +97,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); protected: KPixmapRegionSelectorWidget *m_pixmapSelectorWidget; diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 2b2ef9ba..2d2c0e97 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -37,8 +37,8 @@ #include <tqcursor.h> #include <tqapplication.h> -KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent, - const char *name) : TQWidget( tqparent, name) +KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, + const char *name) : TQWidget( parent, name) { TQHBoxLayout * hboxLayout=new TQHBoxLayout( this ); diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h index 036b232a..ab69f65c 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h @@ -49,7 +49,7 @@ public: /** * Constructor for a KPixmapRegionSelectorWidget. */ - KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L); + KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L); /** * Destructor for a KPixmapRegionSelectorWidget diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp index b2e547fa..62169986 100644 --- a/kopete/libkopete/connectionmanager.cpp +++ b/kopete/libkopete/connectionmanager.cpp @@ -20,7 +20,7 @@ class ConnectionManagerPrivate }; // Connection manager itself -ConnectionManager::ConnectionManager( TQObject * tqparent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( tqparent, name ) +ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( parent, name ) { d = new ConnectionManagerPrivate; diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h index b0f1c05b..24d59f33 100644 --- a/kopete/libkopete/connectionmanager.h +++ b/kopete/libkopete/connectionmanager.h @@ -50,7 +50,7 @@ class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObje k_dcop: void slotStatusChanged( TQString host, int status ); private: - ConnectionManager( TQObject *tqparent, const char * name ); + ConnectionManager( TQObject *parent, const char * name ); ConnectionManagerPrivate *d; static ConnectionManager * s_self; }; diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index b68533b9..b0727cce 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -59,7 +59,7 @@ static TQString unionContents( TQString arg1, TQString arg2 ) return out; } -KABCPersistence::KABCPersistence( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ) +KABCPersistence::KABCPersistence( TQObject * parent, const char * name ) : TQObject( parent, name ) { s_pendingResources.setAutoDelete( false ); } diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/kabcpersistence.h index c6224627..1e027cc5 100644 --- a/kopete/libkopete/kabcpersistence.h +++ b/kopete/libkopete/kabcpersistence.h @@ -55,7 +55,7 @@ class KOPETE_EXPORT KABCPersistence : public TQObject */ static KABCPersistence* self(); - KABCPersistence( TQObject * tqparent = 0, const char * name = 0 ); + KABCPersistence( TQObject * parent = 0, const char * name = 0 ); ~KABCPersistence(); /** * @brief Access Kopete's KDE address book instance diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 64907727..6dbc1bac 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -101,13 +101,13 @@ public: } }; -KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *tqparent, - const char *name) : TQObject(tqparent, name), config(kconfig) { +KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, + const char *name) : TQObject(parent, name), config(kconfig) { d = new KAutoConfigPrivate(); } -KAutoConfig::KAutoConfig(TQObject *tqparent, const char *name) : - TQObject(tqparent, name), config(KGlobal::config()) { +KAutoConfig::KAutoConfig(TQObject *parent, const char *name) : + TQObject(parent, name), config(KGlobal::config()) { d = new KAutoConfigPrivate(); } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index c63fcd25..ea781976 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -121,19 +121,19 @@ public: * Constructor. * @param kconfig - KConfig to use when retrieving/saving the widgets * that KAutoConfig knows about. - * @param tqparent - Parent object. + * @param parent - Parent object. * @param name - Object name. */ - KAutoConfig( KConfig *kconfig, TQObject *tqparent=0, const char *name=0 ); + KAutoConfig( KConfig *kconfig, TQObject *parent=0, const char *name=0 ); /** * Constructor. * Uses KGlobal::config() when retrieving/saving the widgets that * KAutoConfig knows about. - * @param tqparent - Parent object. + * @param parent - Parent object. * @param name - Object name. */ - KAutoConfig( TQObject *tqparent=0, const char *name=0 ); + KAutoConfig( TQObject *parent=0, const char *name=0 ); /** * Destructor. Deletes private class. diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index c15b992f..437f1bff 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -30,8 +30,8 @@ class KCAutoConfigModule::KCAutoConfigModulePrivate }; -KCAutoConfigModule::KCAutoConfigModule( TQWidget * tqparent, const char * name, const TQStringList & args ) - : KCModule( tqparent, name, args ) +KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, const TQStringList & args ) + : KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); @@ -39,8 +39,8 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * tqparent, const char * name, connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * tqparent, const TQStringList & args ) - : KCModule( instance, tqparent, args ) +KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * parent, const TQStringList & args ) + : KCModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); @@ -50,16 +50,16 @@ KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * tqparen -KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * tqparent, const char * name, const TQStringList & args ) - : KCModule( tqparent, name, args ) , d( new KCAutoConfigModulePrivate ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const char * name, const TQStringList & args ) + : KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * tqparent, const TQStringList & args ) - : KCModule( instance, tqparent, args ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * parent, const TQStringList & args ) + : KCModule( instance, parent, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index d09173ea..9102f2b4 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -39,8 +39,8 @@ class KConfig; * typedef KGenericFactory<MyPageConfig, TQWidget> MyPageConfigFactory; * K_EXPORT_COMPONENT_FACTORY( kcm_mypageconfig, MyPageConfigFactory( "kcm_mypageconfig" ) ) * - * MyPageConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - * : KCAutoConfigModule( MyPageConfigFactory::instance(), tqparent, args ) + * MyPageConfig( TQWidget * parent, const char *, const TQStringList & args ) + * : KCAutoConfigModule( MyPageConfigFactory::instance(), parent, args ) * { * setMainWidget( new MyPageConfigBase(this) , "MyGroup" ); * } @@ -58,40 +58,40 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( TQWidget * tqparent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( KInstance * instance, TQWidget * tqparent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. * @param config the KConfig to use * @param instance KInstance object for this KCM - * @param tqparent tqparent widget + * @param parent parent widget * @param args special arguments for this KCM * * @todo document what the args mean (inherited from KCModule?) */ - KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * tqparent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); /** * Constructor, much like the one above, except with * no instance and with a name. * @param config the KConfig to use - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of the object * @param args special arguments for this KCM */ - KCAutoConfigModule(KConfig* config, TQWidget * tqparent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); ~KCAutoConfigModule(); /** * Set the main widget. @p widget will be lay out to take all available place in the module. - * @p widget must have this module as tqparent. + * @p widget must have this module as parent. * * This method automatically call KAutoConfig::addWidget() and KAutoConfig::retrieveSettings() * @@ -114,7 +114,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the config from the configfile. * - * You can also reimplement this method, but you should always call the tqparent KCModule::load() + * You can also reimplement this method, but you should always call the parent KCModule::load() * be sure you know what you are doing */ virtual void load(); @@ -122,7 +122,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Save the config to the configfile. * - * You can also reimplement this method, but you should always call the tqparent KCModule::save() + * You can also reimplement this method, but you should always call the parent KCModule::save() * be sure you know what you are doing */ virtual void save(); @@ -130,7 +130,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the default config * - * You can also reimplement this method, but you should always call the tqparent KCModule::defaults() + * You can also reimplement this method, but you should always call the parent KCModule::defaults() * be sure you know what you are doing */ virtual void defaults(); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index 68ef32fa..f9418ea2 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -63,8 +63,8 @@ struct KNotification::Private int level; }; -KNotification::KNotification(TQObject *tqparent) : - TQObject(tqparent) , d(new Private) +KNotification::KNotification(TQObject *parent) : + TQObject(parent) , d(new Private) { m_linkClicked = false; } diff --git a/kopete/libkopete/knotification.h b/kopete/libkopete/knotification.h index ece07bf6..96789942 100644 --- a/kopete/libkopete/knotification.h +++ b/kopete/libkopete/knotification.h @@ -140,7 +140,7 @@ public slots: private: struct Private; Private *d; - KNotification(TQObject *tqparent=0L); + KNotification(TQObject *parent=0L); /** * recursive function that raise the widget. @p w * @@ -176,7 +176,7 @@ public: * @param pixmap is a picture which may be shown in the popup. * @param widget is a widget where the notification reports to * @param actions is a list of action texts. - * @param flags is a bittqmask of NotificationsFlags + * @param flags is a bitmask of NotificationsFlags */ static KNotification *event( const TQString& eventId , const TQString& text=TQString(), const TQPixmap& pixmap=TQPixmap(), TQWidget *widget=0L, @@ -193,8 +193,8 @@ public: * @param present The presentation method of the event * @param level The error message level * @param sound The sound to play if selected with @p present - * @param file The log file to append the message to if selected with @p tqparent - * @param commandLine the command line to run if selected with @p tqparent + * @param file The log file to append the message to if selected with @p parent + * @param commandLine the command line to run if selected with @p parent * @param flags Indicates the way in which the notification should be handled */ static KNotification *userEvent( const TQString& text, const TQPixmap& pixmap, diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 0477ccd3..5d653728 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -83,8 +83,8 @@ public: TQString restoreMessage; }; -Account::Account( Protocol *tqparent, const TQString &accountId, const char *name ) - : TQObject( tqparent, name ), d( new Private( tqparent, accountId ) ) +Account::Account( Protocol *parent, const TQString &accountId, const char *name ) + : TQObject( parent, name ), d( new Private( parent, accountId ) ) { d->configGroup=new KConfigGroup(KGlobal::config(), TQString::tqfromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); @@ -316,7 +316,7 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr return parentContact; } -bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) +bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMode mode ) { if ( contactId == myself()->contactId() ) { @@ -326,7 +326,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM return 0L; } - bool isTemporary= tqparent->isTemporary(); + bool isTemporary= parent->isTemporary(); Contact *c = d->contacts[ contactId ]; if ( c && c->metaContact() ) { @@ -336,7 +336,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM "Account::addContact: You are trying to add an existing temporary contact. Just add it on the list" << endl; //setMetaContact ill take care about the deletion of the old contact - c->setMetaContact(tqparent); + c->setMetaContact(parent); return true; } else @@ -347,12 +347,12 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM return false; //(the contact is not in the correct metacontact, so false) } - bool success = createContact(contactId, tqparent); + bool success = createContact(contactId, parent); if ( success && mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( tqparent ); + KABCPersistence::self()->write( parent ); } return success; @@ -508,9 +508,9 @@ bool Account::isBlocked( const TQString &contactId ) return d->blackList->isBlocked( contactId ); } -void Account::editAccount(TQWidget *tqparent) +void Account::editAccount(TQWidget *parent) { - KDialogBase *editDialog = new KDialogBase( tqparent, "KopeteAccountConfig::editDialog", true, + KDialogBase *editDialog = new KDialogBase( parent, "KopeteAccountConfig::editDialog", true, i18n( "Edit Account" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 205b795f..b7915b5e 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -98,12 +98,12 @@ public: }; /** - * @param tqparent the protocol for this account. The account is a child object of the + * @param parent the protocol for this account. The account is a child object of the * protocol, so it will be automatically deleted when the protocol is. * @param accountID the unique ID of this account. * @param name the name of this TQObject. */ - Account(Protocol *tqparent, const TQString &accountID, const char *name=0L); + Account(Protocol *parent, const TQString &accountID, const char *name=0L); ~Account(); /** @@ -277,16 +277,16 @@ public: * @brief Create a new contact, adding it to an existing metacontact * * If a contact for this account with ID @p contactId is not already on the contact list, - * a new contact with that ID is created, and added to the metacontact @p tqparent. + * a new contact with that ID is created, and added to the metacontact @p parent. * * @param contactId the @ref Contact::contactId of the contact to create - * @param tqparent the tqparent metacontact (must not be 0) + * @param parent the parent metacontact (must not be 0) * @param mode the mode used to add the contact. See addContact(const TQString&,const TQString&,Group*,AddMode) for details. * * @return @c true if creation of the contact succeeded or the contact was already in the list, * @c false otherwise. */ - bool addContact( const TQString &contactId, MetaContact *tqparent, AddMode mode = DontChangeKABC ); + bool addContact( const TQString &contactId, MetaContact *parent, AddMode mode = DontChangeKABC ); /** * @brief Indicate whether the account is connected at all. @@ -353,7 +353,7 @@ protected: * contactId should be the accountID. The online status of the myself contact represents * the account's status. * - * The myself should have the @ref ContactList::myself() as tqparent metacontact + * The myself should have the @ref ContactList::myself() as parent metacontact * */ void setMyself( Contact *myself ); @@ -364,7 +364,7 @@ protected: * You shouldn't ever call this method yourself. To add contacts, use @ref addContact(). * * This method is called by @ref addContact(). In this method, you should create the - * new custom @ref Contact, using @p parentContact as the tqparent. + * new custom @ref Contact, using @p parentContact as the parent. * * If the metacontact is not temporary and the protocol supports it, you can add the * contact to the server. @@ -484,7 +484,7 @@ public slots: /** * Display the edit account widget for the account */ - void editAccount( TQWidget* tqparent = 0L ); + void editAccount( TQWidget* parent = 0L ); /** * Add a user to the blacklist. The default implementation calls diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h index cfca90d3..a8163245 100644 --- a/kopete/libkopete/kopeteaccountmanager.h +++ b/kopete/libkopete/kopeteaccountmanager.h @@ -140,7 +140,7 @@ public slots: * * @param category is one of the Kopete::OnlineStatusManager::Categories * @param awayMessage is the new away message - * @param flags is a bittqmask of SetOnlineStatusFlag + * @param flags is a bitmask of SetOnlineStatusFlag */ void setOnlineStatus( /*Kopete::OnlineStatusManager::Categories*/ uint category, const TQString& awayMessage = TQString(), uint flags=0); diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 04ac9a03..035e12c2 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -74,7 +74,7 @@ struct KopeteAwayPrivate int mouse_x; int mouse_y; - unsigned int mouse_tqmask; + unsigned int mouse_mask; #ifdef TQ_WS_X11 Window root; /* root window the pointer is on */ Screen* screen; /* screen the pointer is on */ @@ -110,7 +110,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") Display *dsp = qt_xdisplay(); #endif d->mouse_x = d->mouse_y=0; - d->mouse_tqmask = 0; + d->mouse_mask = 0; #ifdef TQ_WS_X11 d->root = DefaultRootWindow (dsp); d->screen = ScreenOfDisplay (dsp, DefaultScreen (dsp)); @@ -372,7 +372,7 @@ bool Kopete::Away::isActivity() Display *dsp = qt_xdisplay(); Window dummy_w; int dummy_c; - unsigned int tqmask; /* modifier tqmask */ + unsigned int mask; /* modifier mask */ int root_x; int root_y; @@ -388,7 +388,7 @@ bool Kopete::Away::isActivity() * we now call that periodically anyway? */ if (!XQueryPointer (dsp, d->root, &(d->root), &dummy_w, &root_x, &root_y, - &dummy_c, &dummy_c, &tqmask)) + &dummy_c, &dummy_c, &mask)) { /* * Pointer has moved to another screen, so let's find out which one. @@ -432,10 +432,10 @@ bool Kopete::Away::isActivity() // Only check idle time if we have some way of measuring it, otherwise if // we've neither Mit nor Xidle it'll still be zero and we'll always appear active. // FIXME: what problem does the 2000ms fudge solve? - if (root_x != d->mouse_x || root_y != d->mouse_y || tqmask != d->mouse_tqmask + if (root_x != d->mouse_x || root_y != d->mouse_y || mask != d->mouse_mask || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000)) { - // -1 => just gone autoaway, ignore aptqparent activity this time round + // -1 => just gone autoaway, ignore apparent activity this time round // anything else => genuine activity // See setAutoAway(). if (d->mouse_x != -1) @@ -444,7 +444,7 @@ bool Kopete::Away::isActivity() } d->mouse_x = root_x; d->mouse_y = root_y; - d->mouse_tqmask = tqmask; + d->mouse_mask = mask; d->xIdleTime = xIdleTime; } #endif // TQ_WS_X11 @@ -484,7 +484,7 @@ void Kopete::Away::setActive() void Kopete::Away::setAutoAway() { // A value of -1 in mouse_x indicates to checkActivity() that next time it - // fires it should ignore any aptqparent idle/mouse/keyboard changes. + // fires it should ignore any apparent idle/mouse/keyboard changes. // I think the point of this is that if you manually start the screensaver // then there'll unavoidably be some residual mouse/keyboard activity // that should be ignored. diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index c72d94bc..ac656fbb 100644 --- a/kopete/libkopete/kopeteawayaction.cpp +++ b/kopete/libkopete/kopeteawayaction.cpp @@ -37,8 +37,8 @@ public: AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) - : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( OnlineStatus() ) ) + const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) + : KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -53,8 +53,8 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortc } AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) - : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( status ) ) + const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) + : KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h index 6bc64581..707750f6 100644 --- a/kopete/libkopete/kopeteawayaction.h +++ b/kopete/libkopete/kopeteawayaction.h @@ -44,23 +44,23 @@ class KOPETE_EXPORT AwayAction : public KSelectAction public: /** * Constructor - * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and * @p name are all handled by KSelectAction. **/ AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, const TQObject *receiver, const char *slot, - TQObject *tqparent, const char *name = 0); + TQObject *parent, const char *name = 0); /** * Constructor * @param status the OnlineStatus that appears in the signal * @param slot must have the following signature: ( const OnlineStatus &, const TQString & ) - * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and * @p name are all handled by KSelectAction. **/ AwayAction(const OnlineStatus &status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, const TQObject *receiver, const char *slot, - TQObject *tqparent, const char *name = 0); + TQObject *parent, const char *name = 0); /** * Destructor. diff --git a/kopete/libkopete/kopeteawaydialog.cpp b/kopete/libkopete/kopeteawaydialog.cpp index 944e379f..19d9fb9c 100644 --- a/kopete/libkopete/kopeteawaydialog.cpp +++ b/kopete/libkopete/kopeteawaydialog.cpp @@ -33,8 +33,8 @@ public: KopeteAwayDialog_Base *base; }; -KopeteAwayDialog::KopeteAwayDialog( TQWidget *tqparent, const char *name ) -: KDialogBase( tqparent, name, true, i18n( "Global Away Message" ), +KopeteAwayDialog::KopeteAwayDialog( TQWidget *parent, const char *name ) +: KDialogBase( parent, name, true, i18n( "Global Away Message" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { //kdDebug( 14010 ) << k_funcinfo << "Building KopeteAwayDialog..." << endl; diff --git a/kopete/libkopete/kopeteawaydialog.h b/kopete/libkopete/kopeteawaydialog.h index 1c494e60..1ca75615 100644 --- a/kopete/libkopete/kopeteawaydialog.h +++ b/kopete/libkopete/kopeteawaydialog.h @@ -58,10 +58,10 @@ class KOPETE_EXPORT KopeteAwayDialog : public KDialogBase public: /** * Constructor for the Away Dialog - * @param tqparent The object that owns this + * @param parent The object that owns this * @param name Name for this object */ - KopeteAwayDialog( TQWidget *tqparent = 0, const char *name = 0 ); + KopeteAwayDialog( TQWidget *parent = 0, const char *name = 0 ); /** * Destructor diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index b85eef03..7030fdbd 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -34,8 +34,8 @@ public: }; -BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *tqparent, const char *name) - : TQObject(tqparent, name), d( new Private ) +BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) + : TQObject(parent, name), d( new Private ) { KConfig *config = KGlobal::config(); diff --git a/kopete/libkopete/kopeteblacklister.h b/kopete/libkopete/kopeteblacklister.h index d5c946fe..a9f82157 100644 --- a/kopete/libkopete/kopeteblacklister.h +++ b/kopete/libkopete/kopeteblacklister.h @@ -52,10 +52,10 @@ public: * Create an instance, and read the blacklist from disk if it exists. * @param protocolId is the ID of the protocol owning accountId * @param accountId is the ID of the owning Account. - * @param tqparent The TQObject tqparent for this class. + * @param parent The TQObject parent for this class. * @param name The TQObject name for this class. */ - BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *tqparent = 0, const char *name = 0 ); + BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *parent = 0, const char *name = 0 ); ~BlackLister(); /** diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 5c7388e3..63cf8e38 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -43,9 +43,9 @@ ChatSessionManager* ChatSessionManager::self() return s_self; } -ChatSessionManager::ChatSessionManager( TQObject* tqparent, +ChatSessionManager::ChatSessionManager( TQObject* parent, const char* name ) - : TQObject( tqparent, name ) + : TQObject( parent, name ) { d=new Private; s_self = this; diff --git a/kopete/libkopete/kopetechatsessionmanager.h b/kopete/libkopete/kopetechatsessionmanager.h index bc1635d8..b78509fc 100644 --- a/kopete/libkopete/kopetechatsessionmanager.h +++ b/kopete/libkopete/kopetechatsessionmanager.h @@ -176,7 +176,7 @@ public slots: void slotReadMessage(); private: - ChatSessionManager( TQObject* tqparent = 0, const char* name = 0 ); + ChatSessionManager( TQObject* parent = 0, const char* name = 0 ); class Private; Private *d; diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index c182a495..04153e86 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -156,36 +156,36 @@ Kopete::CommandHandler *Kopete::CommandHandler::commandHandler() return p->s_handler; } -void Kopete::CommandHandler::registerCommand( TQObject *tqparent, const TQString &command, const char* handlerSlot, +void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, const TQString &help, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) { TQString lowerCommand = command.lower(); - Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerCommand, handlerSlot, help, + Kopete::Command *mCommand = new Kopete::Command( parent, lowerCommand, handlerSlot, help, Normal, TQString(), minArgs, maxArgs, cut, pix); - p->pluginCommands[ tqparent ].insert( lowerCommand, mCommand ); + p->pluginCommands[ parent ].insert( lowerCommand, mCommand ); } -void Kopete::CommandHandler::unregisterCommand( TQObject *tqparent, const TQString &command ) +void Kopete::CommandHandler::unregisterCommand( TQObject *parent, const TQString &command ) { - if( p->pluginCommands[ tqparent ].find(command) ) - p->pluginCommands[ tqparent ].remove( command ); + if( p->pluginCommands[ parent ].find(command) ) + p->pluginCommands[ parent ].remove( command ); } -void Kopete::CommandHandler::registerAlias( TQObject *tqparent, const TQString &alias, const TQString &formatString, +void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString, const TQString &help, CommandType type, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) { TQString lowerAlias = alias.lower(); - Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerAlias, 0L, help, type, + Kopete::Command *mCommand = new Kopete::Command( parent, lowerAlias, 0L, help, type, formatString, minArgs, maxArgs, cut, pix ); - p->pluginCommands[ tqparent ].insert( lowerAlias, mCommand ); + p->pluginCommands[ parent ].insert( lowerAlias, mCommand ); } -void Kopete::CommandHandler::unregisterAlias( TQObject *tqparent, const TQString &alias ) +void Kopete::CommandHandler::unregisterAlias( TQObject *parent, const TQString &alias ) { - if( p->pluginCommands[ tqparent ].find(alias) ) - p->pluginCommands[ tqparent ].remove( alias ); + if( p->pluginCommands[ parent ].find(alias) ) + p->pluginCommands[ parent ].remove( alias ); } bool Kopete::CommandHandler::processMessage( const TQString &msg, Kopete::ChatSession *manager ) diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index aeb93529..5ffa76bb 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -74,7 +74,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject * Kopete::CommandHandler). These commands can also be overridden by * registering a new duplicate command. * - * @param tqparent The plugin who owns this command + * @param parent The plugin who owns this command * @param command The command we want to handle, not including the '/' * @param handlerSlot The slot used to handle the command. This slot must * accept two parameters, a TQString of arguments, and a Kopete::ChatSession @@ -86,14 +86,14 @@ class KOPETE_EXPORT CommandHandler : public TQObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerCommand( TQObject *tqparent, const TQString &command, const char* handlerSlot, + void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, const TQString &help = TQString(), uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, const TQString &pix = TQString() ); /** * \brief Register a command alias. * - * @param tqparent The plugin who owns this alias + * @param parent The plugin who owns this alias * @param alias The command for the alias * @param formatString This is the string that will be transformed into another * command. The formatString should begin with an already existing command, @@ -107,7 +107,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerAlias( TQObject *tqparent, + void registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString, const TQString &help = TQString(), @@ -124,19 +124,19 @@ class KOPETE_EXPORT CommandHandler : public TQObject * This function should only be called in the case of a plugin which loads and * unloads commands dynamically. * - * @param tqparent The plugin who owns this command + * @param parent The plugin who owns this command * @param command The command to unload */ - void unregisterCommand( TQObject *tqparent, const TQString &command ); + void unregisterCommand( TQObject *parent, const TQString &command ); /** * \brief Unregister an alias. * - * \see unregisterCommand( TQObject *tqparent, const TQString &command ) - * @param tqparent The plugin who owns this alias + * \see unregisterCommand( TQObject *parent, const TQString &command ) + * @param parent The plugin who owns this alias * @param alias The alais to unload */ - void unregisterAlias( TQObject *tqparent, const TQString &alias ); + void unregisterAlias( TQObject *parent, const TQString &alias ); /** * \brief Process a message to see if any commands should be handled diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 029565d0..66ecf11f 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -79,15 +79,15 @@ public: }; Contact::Contact( Account *account, const TQString &contactId, - MetaContact *tqparent, const TQString &icon ) - : TQObject( tqparent ) + MetaContact *parent, const TQString &icon ) + : TQObject( parent ) { d = new Private; //kdDebug( 14010 ) << k_funcinfo << "Creating contact with id " << contactId << endl; d->contactId = contactId; - d->metaContact = tqparent; + d->metaContact = parent; d->fileCapable = false; d->account = account; d->idleTime = 0; @@ -101,15 +101,15 @@ Contact::Contact( Account *account, const TQString &contactId, connect( account, TQT_SIGNAL( isConnectedChanged() ), TQT_SLOT( slotAccountIsConnectedChanged() ) ); } - // Need to check this because myself() may have no tqparent + // Need to check this because myself() may have no parent // Maybe too the metaContact doesn't have a valid protocol() // (ex: for unit tests or chat window style preview) - if( tqparent && protocol() ) + if( parent && protocol() ) { - connect( tqparent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + connect( parent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); - tqparent->addContact( this ); + parent->addContact( this ); } diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h index 4f8454fc..e24e23f0 100644 --- a/kopete/libkopete/kopetecontact.h +++ b/kopete/libkopete/kopetecontact.h @@ -73,7 +73,7 @@ public: /** * \brief Create new contact. * - * <b>The tqparent MetaContact must not be NULL</b> + * <b>The parent MetaContact must not be NULL</b> * * \note id is required to be unique per protocol and per account. * Across those boundaries ids may occur multiple times. @@ -82,12 +82,12 @@ public: * value! Even if it may look like an ICQ UIN or an MSN passport, * this is undefined and may change at any time! * - * @param account is the tqparent account. this constructor automatically register the contact to the account + * @param account is the parent account. this constructor automatically register the contact to the account * @param id is the Contact's unique Id (mostly the user's login) - * @param tqparent is the tqparent @ref MetaContact this Contact is part of + * @param parent is the parent @ref MetaContact this Contact is part of * @param icon is an optional icon */ - Contact( Account *account, const TQString &id, MetaContact *tqparent, + Contact( Account *account, const TQString &id, MetaContact *parent, const TQString &icon = TQString() ); ~Contact(); @@ -218,7 +218,7 @@ public: * which is displayed in showContextMenu (private). Protocols * should use this to add protocol-specific actions to the * popup menu. Kopete take care of the deletion of the action collection. - * Actions should have the collection as tqparent. + * Actions should have the collection as parent. * * @return Collection of menu items to be show on the context menu * @todo if possible, try to use KXMLGUI @@ -449,7 +449,7 @@ public slots: * * default implementation does nothing * - * @param changed is a bittqmask of the @ref Changed enum which say why the call to this funtion is done. + * @param changed is a bitmask of the @ref Changed enum which say why the call to this funtion is done. */ virtual void sync(unsigned int changed = 0xFF); diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 421354a6..1a16b04d 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -85,7 +85,7 @@ ContactList::ContactList() d=new Private; //the myself metacontact can't be created now, because it will use - //ContactList::self() as tqparent which will call this constructor -> infinite loop + //ContactList::self() as parent which will call this constructor -> infinite loop d->myself=0L; //no contactlist loaded yet, don't save them diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index 2357da53..5833fb34 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -132,7 +132,7 @@ public: /** * return the metacontact that represent the user itself. - * This metacontact should be the tqparent of every Kopete::Account::myself() contacts. + * This metacontact should be the parent of every Kopete::Account::myself() contacts. * * This metacontact is not in the contactlist. */ diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index 28766a0b..a9e812cd 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -34,8 +34,8 @@ public: bool useCustomIcon; }; -ContactListElement::ContactListElement( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +ContactListElement::ContactListElement( TQObject *parent, const char *name ) +: TQObject( parent, name ) { d = new Private; diff --git a/kopete/libkopete/kopetecontactlistelement.h b/kopete/libkopete/kopetecontactlistelement.h index 808b36b2..7afda322 100644 --- a/kopete/libkopete/kopetecontactlistelement.h +++ b/kopete/libkopete/kopetecontactlistelement.h @@ -47,7 +47,7 @@ class KOPETE_EXPORT ContactListElement : public TQObject /* public KopeteNotify TQ_OBJECT protected: - ContactListElement( TQObject *tqparent = 0L, const char *name = 0L ); + ContactListElement( TQObject *parent = 0L, const char *name = 0L ); ~ContactListElement(); diff --git a/kopete/libkopete/kopetemessageevent.cpp b/kopete/libkopete/kopetemessageevent.cpp index 09e61605..d50c85e9 100644 --- a/kopete/libkopete/kopetemessageevent.cpp +++ b/kopete/libkopete/kopetemessageevent.cpp @@ -37,8 +37,8 @@ public: EventState state; }; -MessageEvent::MessageEvent( const Message& m, TQObject *tqparent, const char *name ) - : TQObject(tqparent,name), d( new Private ) +MessageEvent::MessageEvent( const Message& m, TQObject *parent, const char *name ) + : TQObject(parent,name), d( new Private ) { d->message = m; d->state = Nothing; diff --git a/kopete/libkopete/kopetemessageevent.h b/kopete/libkopete/kopetemessageevent.h index daf38e04..2432c0a5 100644 --- a/kopete/libkopete/kopetemessageevent.h +++ b/kopete/libkopete/kopetemessageevent.h @@ -45,7 +45,7 @@ class KOPETE_EXPORT MessageEvent : public TQObject TQ_OBJECT public: - MessageEvent(const Kopete::Message& , TQObject* tqparent=0L, const char *name=0L); + MessageEvent(const Kopete::Message& , TQObject* parent=0L, const char *name=0L); ~MessageEvent(); /** diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index c671ace4..05925690 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -272,7 +272,7 @@ void MetaContact::removeContact(Contact *c, bool deleted) KABCPersistence::self()->write( this ); } - // Retqparent the contact + // Reparent the contact removeChild( c ); emit contactRemoved( c ); diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index e94f92d8..9415a428 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -103,7 +103,7 @@ OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories * 4 5 6 7 * /\ / \ / \ / \ * 8 9 10 11 12 13 14 15 - * To get the tqparent of a key, one just divide per two the number + * To get the parent of a key, one just divide per two the number */ Private::ProtocolMap protocolMap=d->registeredtqStatus[protocol]; @@ -368,7 +368,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const return basis; } -void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *tqparent) +void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent) { Private::ProtocolMap protocolMap=d->registeredtqStatus[account->protocol()]; Private::ProtocolMap::Iterator it; @@ -383,7 +383,7 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction KAction *action; // Any existing actions owned by the account are reused by recovering them - // from the tqparent's child list. + // from the parent's child list. // The description of the onlinestatus is used as the qobject name // This is safe as long as OnlineStatus are immutable TQCString actionName = status.description().ascii(); @@ -409,15 +409,15 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction action->setEnabled(false); #endif - if(tqparent) - tqparent->insert(action); + if(parent) + parent->insert(action); } } -OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *tqparent, const char *name) - : KAction( text, pix, KShortcut() , tqparent, name) , m_status(status) +OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name) + : KAction( text, pix, KShortcut() , parent, name) , m_status(status) { connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated())); } diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h index 0ce2f983..547e47d8 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.h +++ b/kopete/libkopete/kopeteonlinestatusmanager.h @@ -107,15 +107,15 @@ public: /** * insert "settqStatus" actions from the given account to the specified actionMenu. - * (actions have that menu as tqparent TQObject) + * (actions have that menu as parent TQObject) * they are connected to the Account::setOnlineStatus signal * * Items are stored by status height. * * @param account the account - * @param tqparent the ActionMenu where action are inserted + * @param parent the ActionMenu where action are inserted */ - void createAccountStatusActions( Account *account , KActionMenu *tqparent); + void createAccountStatusActions( Account *account , KActionMenu *parent); /** * return the status of the @p protocol which is in the category @p category @@ -154,7 +154,7 @@ class OnlineStatusAction : public KAction Q_OBJECT TQ_OBJECT public: - OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0); + OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent=0, const char *name=0); signals: void activated( const Kopete::OnlineStatus& status ); private slots: diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 329ba8e8..ebdcde8b 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -288,7 +288,7 @@ public: //NOTE: This will start a nested event loop. However, this is fine; the only code we // call after this point is in Kopete::Password, so as long as we've not been deleted - // everything should work out OK. We have no tqparent TQObject, so we should survive. + // everything should work out OK. We have no parent TQObject, so we should survive. if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n( "<qt>Kopete is unable to save your password securely in your wallet;<br>" "do you want to save the password in the <b>unsafe</b> configuration file instead?</qt>" ), diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index f1323f45..68dd7917 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -31,14 +31,14 @@ struct Kopete::PasswordedAccount::Private Kopete::OnlineStatus initialtqStatus; }; -Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, const char *name ) - : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) ) +Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name ) + : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) ) { } -Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, +Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, bool allowBlankPassword, const char *name ) - : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) + : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) { } diff --git a/kopete/libkopete/kopetepasswordedaccount.h b/kopete/libkopete/kopetepasswordedaccount.h index a9fa2f54..4be22016 100644 --- a/kopete/libkopete/kopetepasswordedaccount.h +++ b/kopete/libkopete/kopetepasswordedaccount.h @@ -41,25 +41,25 @@ public: /** * KopetePasswordedAccount constructor - * @param tqparent The protocol this account connects via + * @param parent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit * @param name The name for this TQObject * * @deprecated Use the constructor that specifies if a blank password is allowed */ - PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); /** * KopetePasswordedAccount constructor - * @param tqparent The protocol this account connects via + * @param parent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit * @param allowBlankPassword If this protocol allows blank passwords. Note that this will mean that * * @param name The name for this TQObject */ - PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, + PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, bool allowBlankPassword = false, const char *name = 0 ); virtual ~PasswordedAccount(); diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 13afd9ca..2a4542f6 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -32,8 +32,8 @@ public: TQString indexField; }; -Plugin::Plugin( KInstance *instance, TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ), KXMLGUIClient(), d(new Private) +Plugin::Plugin( KInstance *instance, TQObject *parent, const char *name ) +: TQObject( parent, name ), KXMLGUIClient(), d(new Private) { setInstance( instance ); KSettings::Dispatcher::self()->registerInstance( instance, this, TQT_SIGNAL( settingsChanged() ) ); diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index 311c796f..e22e1b37 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -71,8 +71,8 @@ Comment=Plugin that do some nice stuff static const KAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) ) - MyPlugin::MyPlugin( TQObject *tqparent, const char *name, const TQStringList & args ) - : Kopete::Plugin( MyPluginFactory::instance(), tqparent, name ) + MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args ) + : Kopete::Plugin( MyPluginFactory::instance(), parent, name ) { //... } @@ -93,7 +93,7 @@ class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient TQ_OBJECT public: - Plugin( KInstance *instance, TQObject *tqparent, const char *name ); + Plugin( KInstance *instance, TQObject *parent, const char *name ); virtual ~Plugin(); /** diff --git a/kopete/libkopete/kopeteproperties.h b/kopete/libkopete/kopeteproperties.h index bb27b82f..5b04e4a1 100644 --- a/kopete/libkopete/kopeteproperties.h +++ b/kopete/libkopete/kopeteproperties.h @@ -89,11 +89,11 @@ class Property : public PropertyBase<Parent> { public: /** - * Returns the value of this property in the object @p tqparent. + * Returns the value of this property in the object @p parent. */ - virtual Type get( const Parent *tqparent ) const = 0; + virtual Type get( const Parent *parent ) const = 0; /** - * Sets the value of this property in the object @p tqparent. + * Sets the value of this property in the object @p parent. */ virtual void set( Parent *, const Type & ) const = 0; }; @@ -101,7 +101,7 @@ public: /** * @brief Base class for property data objects * - * Some property objects want to store property-specific data in their tqparent objects. + * Some property objects want to store property-specific data in their parent objects. * To support that, subclasses of this class are permitted to be stored. Once passed * to the @ref PropertyStorage object via @ref PropertyStorage::setCustomPropertyData, * the @ref PropertyStorage object owns the PropertyData, and will delete it when it diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index f471d577..d6910ebd 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -50,8 +50,8 @@ public: Kopete::OnlineStatus accountNotConnectedtqStatus; }; -Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) -: Plugin( instance, tqparent, name ) +Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) +: Plugin( instance, parent, name ) { d = new Private; d->mStickLastSeen = Global::Properties::self()->lastSeen(); diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index 64cab27c..6160650a 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -86,7 +86,7 @@ public: * * @return A new AddContactPage to be shown in the Add Contact Wizard */ - virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Account *account ) = 0; + virtual AddContactPage *createAddContactWidget( TQWidget *parent, Account *account ) = 0; /** * @brief Create a new KopeteEditAccountWidget @@ -94,13 +94,13 @@ public: * @return A new KopeteEditAccountWidget to be shown in the account part of the configurations. * * @param account is the KopeteAccount to edit. If it's 0L, then we create a new account - * @param tqparent The tqparent of the 'to be returned' widget + * @param parent The parent of the 'to be returned' widget */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *tqparent ) = 0; + virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *parent ) = 0; /** - * @brief a bittqmask of the capabilities of this protocol + * @brief a bitmask of the capabilities of this protocol * @sa @ref setCapabilities */ unsigned int capabilities() const ; @@ -161,10 +161,10 @@ protected: * @brief Constructor for Protocol * * @param instance The protocol's instance, every plugin needs to have a KInstance of its own - * @param tqparent The protocol's tqparent object + * @param parent The protocol's parent object * @param name The protocol's name */ - Protocol( KInstance *instance, TQObject *tqparent, const char *name ); + Protocol( KInstance *instance, TQObject *parent, const char *name ); /** * @brief Sets the capabilities of this protcol. diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 91ca9b27..9357118f 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -158,7 +158,7 @@ Kopete::TransferManager* Kopete::TransferManager::transferManager() return s_transferManager; } -Kopete::TransferManager::TransferManager( TQObject *tqparent ) : TQObject( tqparent ) +Kopete::TransferManager::TransferManager( TQObject *parent ) : TQObject( parent ) { nextID = 0; } diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index 30906b97..4a952e10 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -121,7 +121,7 @@ private slots: void slotComplete(KIO::Job*); private: - TransferManager( TQObject *tqparent ); + TransferManager( TQObject *parent ); static TransferManager *s_transferManager; int nextID; diff --git a/kopete/libkopete/kopeteuiglobal.h b/kopete/libkopete/kopeteuiglobal.h index c23bc99b..7db34189 100644 --- a/kopete/libkopete/kopeteuiglobal.h +++ b/kopete/libkopete/kopeteuiglobal.h @@ -39,7 +39,7 @@ namespace Global KOPETE_EXPORT void setMainWidget( TQWidget *widget ); /** * Returns the main widget - this is the widget that message boxes - * and KNotify stuff should use as a tqparent. + * and KNotify stuff should use as a parent. */ KOPETE_EXPORT TQWidget *mainWidget(); diff --git a/kopete/libkopete/managedconnectionaccount.cpp b/kopete/libkopete/managedconnectionaccount.cpp index 05dbf9cf..c7ca976e 100644 --- a/kopete/libkopete/managedconnectionaccount.cpp +++ b/kopete/libkopete/managedconnectionaccount.cpp @@ -24,8 +24,8 @@ namespace Kopete { -ManagedConnectionAccount::ManagedConnectionAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength, const char *name ) - : PasswordedAccount( tqparent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) +ManagedConnectionAccount::ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength, const char *name ) + : PasswordedAccount( parent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) { TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ), TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ) ); diff --git a/kopete/libkopete/managedconnectionaccount.h b/kopete/libkopete/managedconnectionaccount.h index 1de3a7ad..a27bd7cd 100644 --- a/kopete/libkopete/managedconnectionaccount.h +++ b/kopete/libkopete/managedconnectionaccount.h @@ -40,12 +40,12 @@ class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount public: /** * @brief ManagedConnectionAccount constructor. - * @param tqparent The protocol this account connects via + * @param parent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit * @param name The name for this TQObject */ - ManagedConnectionAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); public slots: /** * @brief Begin the connection process, by checking if the connection is available with the ConnectionManager. diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index e80788bf..f9ae7365 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -25,10 +25,10 @@ #include "kopetecommand.h" #include "kopeteuiglobal.h" -Kopete::Command::Command( TQObject *tqparent, const TQString &command, const char* handlerSlot, +Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot, const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) - : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, tqparent, + : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent, ( command.lower() + TQString::tqfromLatin1("_command") ).latin1() ) { init( command, handlerSlot, help, type, formatString, minArgs, maxArgs ); @@ -48,7 +48,7 @@ void Kopete::Command::init( const TQString &command, const char* slot, const TQS if( m_type == Kopete::CommandHandler::Normal ) { TQObject::connect( this, TQT_SIGNAL( handleCommand( const TQString &, Kopete::ChatSession *) ), - tqparent(), slot ); + parent(), slot ); } TQObject::connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotAction() ) ); diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h index d49de208..47286967 100644 --- a/kopete/libkopete/private/kopetecommand.h +++ b/kopete/libkopete/private/kopetecommand.h @@ -36,7 +36,7 @@ class Command : public KAction /** * Creates a Kopete::Command object * - * @param tqparent The plugin who owns this command + * @param parent The plugin who owns this command * @param command The command we want to handle, not including the '/' * @param handlerSlot The slot used to handle the command. This slot must * accept two parameters, a TQString of arguments, and a Kopete::ChatSession @@ -50,7 +50,7 @@ class Command : public KAction * @param cut The shortcut for the command * @param pix The icon to use for the command */ - Command( TQObject *tqparent, const TQString &command, const char* handlerSlot, + Command( TQObject *parent, const TQString &command, const char* handlerSlot, const TQString &help = TQString(), CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString(), uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, const TQString &pix = TQString() ); diff --git a/kopete/libkopete/private/kopeteemoticons.h b/kopete/libkopete/private/kopeteemoticons.h index d9353189..c780ac0c 100644 --- a/kopete/libkopete/private/kopeteemoticons.h +++ b/kopete/libkopete/private/kopeteemoticons.h @@ -120,7 +120,7 @@ public: * 4- /path/to/kiss.png * Note: quotation marks are used to emphasize white spaces. * @param message is the message to tokenize - * @param mode is a bittqmask of ParseMode enum + * @param mode is a bitmask of ParseMode enum * @return a TQValueList which consiste of ordered tokens of the text. * @author Engin AYDOGAN < engin@bzzzt.biz > * @since 23-03-05 diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index f542d153..d6268628 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -26,7 +26,7 @@ namespace Test namespace Mock { -Account::Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name) +Account::Account(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) { } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index 0f297a06..43686ef2 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -36,7 +36,7 @@ namespace Mock class Account : public Kopete::Account { public: - Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); + Account(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L); ~Account(); // pure virtual functions implementation virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp index 04f38727..43a5b81d 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon) : Kopete::Contact( account, id, tqparent, icon) +Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon) : Kopete::Contact( account, id, parent, icon) { } diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h index 437887d9..aba361ac 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.h +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h @@ -35,7 +35,7 @@ namespace Mock class Contact : public Kopete::Contact { public: - Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon = TQString() ); + Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon = TQString() ); ~Contact(); virtual Kopete::ChatSession* manager( CanCreateFlags canCreate = CannotCreate ); }; diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp index 03a65808..97bcfee2 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name) +Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) { } @@ -34,12 +34,12 @@ Account* Protocol::createNewAccount( const TQString &accountId ) return 0L; } -AddContactPage* Protocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ) +AddContactPage* Protocol::createAddContactWidget( TQWidget *parent, Kopete::Account *account ) { return 0L; } -KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) +KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) { return 0L; } diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h index 86b551d5..d2ad36f5 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h @@ -37,11 +37,11 @@ namespace Mock class Protocol : public Kopete::Protocol { public: - Protocol( KInstance *instance, TQObject *tqparent, const char *name ); + Protocol( KInstance *instance, TQObject *parent, const char *name ); // pure virtual functions implemented virtual Account *createNewAccount( const TQString &accountId ); - virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); + virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); }; } // end ns Kopete::Test::Mock diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index e1f31900..3a9b94ff 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -32,8 +32,8 @@ class AccountListViewItem : public KListViewItem Kopete::Account *mAccount; public: - AccountListViewItem(TQListView *tqparent, Kopete::Account *acc) - : KListViewItem(tqparent) + AccountListViewItem(TQListView *parent, Kopete::Account *acc) + : KListViewItem(parent) { if (acc==0) return; @@ -62,8 +62,8 @@ class AccountSelectorPrivate }; -AccountSelector::AccountSelector(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +AccountSelector::AccountSelector(TQWidget *parent, const char *name) + : TQWidget(parent, name) { //kdDebug(14010) << k_funcinfo << "for no special protocol" << endl; d = new AccountSelectorPrivate; @@ -72,8 +72,8 @@ AccountSelector::AccountSelector(TQWidget *tqparent, const char *name) } -AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent, - const char *name) : TQWidget(tqparent, name) +AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *parent, + const char *name) : TQWidget(parent, name) { //kdDebug(14010) << k_funcinfo << " for protocol " << proto->pluginId() << endl; d = new AccountSelectorPrivate; diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h index bdb4c888..2ad22a53 100644 --- a/kopete/libkopete/ui/accountselector.h +++ b/kopete/libkopete/ui/accountselector.h @@ -37,19 +37,19 @@ Q_OBJECT /** * Constructor. * - * The parameters @p tqparent and @p name are handled by + * The parameters @p parent and @p name are handled by * KListView. */ - AccountSelector(TQWidget *tqparent=0, const char *name=0); + AccountSelector(TQWidget *parent=0, const char *name=0); /** * Constructor for a list of accounts for one protocol only * - * The parameters @p tqparent and @p name are handled by + * The parameters @p parent and @p name are handled by * KListView. @p proto defines the protocol whose accounts are * shown in the list */ - AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent=0, const char *name=0); + AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0); /** * Destructor. diff --git a/kopete/libkopete/ui/addcontactpage.cpp b/kopete/libkopete/ui/addcontactpage.cpp index 4916b955..846815f2 100644 --- a/kopete/libkopete/ui/addcontactpage.cpp +++ b/kopete/libkopete/ui/addcontactpage.cpp @@ -17,7 +17,7 @@ #include "addcontactpage.h" -AddContactPage::AddContactPage(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) +AddContactPage::AddContactPage(TQWidget *parent, const char *name ) : TQWidget(parent,name) { } diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h index f215f3b0..8ef81e0e 100644 --- a/kopete/libkopete/ui/addcontactpage.h +++ b/kopete/libkopete/ui/addcontactpage.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - AddContactPage(TQWidget *tqparent=0, const char *name=0); + AddContactPage(TQWidget *parent=0, const char *name=0); virtual ~AddContactPage(); //Kopete::Protocol *protocol; diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index e34518b7..f12e7116 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -38,7 +38,7 @@ namespace Kopete { namespace UI { -AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 ) +AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) { btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) ); connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h index 31d90a8c..cec68f8d 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.h +++ b/kopete/libkopete/ui/addressbooklinkwidget.h @@ -45,7 +45,7 @@ class AddressBookLinkWidget : public AddressBookLinkWidgetBase Q_OBJECT TQ_OBJECT public: - AddressBookLinkWidget( TQWidget * tqparent, const char * name ); + AddressBookLinkWidget( TQWidget * parent, const char * name ); ~AddressBookLinkWidget() {} /** * Set the currently selected addressee diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp index 5133b4ee..44f42e2a 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.cpp +++ b/kopete/libkopete/ui/addressbookselectordialog.cpp @@ -30,7 +30,7 @@ namespace Kopete namespace UI { -AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(tqparent, name, modal, title, Help|Ok|Cancel, Ok, true ) +AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); m_addressBookSelectorWidget= new AddressBookSelectorWidget(vbox); @@ -52,9 +52,9 @@ AddressBookSelectorDialog::~AddressBookSelectorDialog() { } -KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent) +KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent) { - AddressBookSelectorDialog dialog(title, message, preSelectUid, tqparent); + AddressBookSelectorDialog dialog(title, message, preSelectUid, parent); int result = dialog.exec(); KABC::Addressee adr; diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h index db676a3c..235dabd5 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.h +++ b/kopete/libkopete/ui/addressbookselectordialog.h @@ -52,7 +52,7 @@ public: /** * The constructor of an empty AddressBookSelectorWidget */ - AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); + AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog */ @@ -72,7 +72,7 @@ public: * @returns the selected contact, or a null addressee if the user * pressed the Cancel button. Optionally */ - static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent = 0L ); + static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L ); protected slots: virtual void accept(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index a0ce53af..ec9604a8 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -54,8 +54,8 @@ namespace Kopete namespace UI { -AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *tqparent, const char *name ) - : AddressBookSelectorWidget_Base( tqparent, name ) +AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const char *name ) + : AddressBookSelectorWidget_Base( parent, name ) { m_addressBook = Kopete::KABCPersistence::self()->addressBook(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h index 028e6d6c..6aff7fb5 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.h +++ b/kopete/libkopete/ui/addressbookselectorwidget.h @@ -50,7 +50,7 @@ class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget Q_OBJECT TQ_OBJECT public: - AddressBookSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); + AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); ~AddressBookSelectorWidget(); KABC::Addressee addressee(); /** diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp index 382693ea..55b58068 100644 --- a/kopete/libkopete/ui/addresseeitem.cpp +++ b/kopete/libkopete/ui/addresseeitem.cpp @@ -27,8 +27,8 @@ #include "addresseeitem.h" -AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) : - KListViewItem( tqparent ), +AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : + KListViewItem( parent ), mAddressee( addressee ) { //We can't save showphoto because we don't have a d pointer diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h index 695ea6c2..36d1d284 100644 --- a/kopete/libkopete/ui/addresseeitem.h +++ b/kopete/libkopete/ui/addresseeitem.h @@ -46,10 +46,10 @@ class AddresseeItem : public KListViewItem /** Constructor. - @param tqparent The tqparent listview. + @param parent The parent listview. @param addressee The associated addressee. */ - AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee ); + AddresseeItem( TQListView *parent, const KABC::Addressee &addressee ); /** Returns the addressee. diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h index e4fe5a61..ae873344 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.h +++ b/kopete/libkopete/ui/contactaddednotifydialog.h @@ -91,7 +91,7 @@ public: * @param contactId the contactId of the contact which just added the user * @param contactNick the nickname of the contact if available. * @param account is used to display the account icon and informaiton about the account - * @param hide a bittqmask of HideWidget used to hide some widget. By default, everything is shown. + * @param hide a bitmask of HideWidget used to hide some widget. By default, everything is shown. * */ ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString(), @@ -153,7 +153,7 @@ signals: * signal to a slot which show a dialog with more info about the * contact. * - * hint: you can use sender() as tqparent of the new dialog + * hint: you can use sender() as parent of the new dialog * @param contactId is the id of the contact passed in the constructor. */ void infoClicked(const TQString &contactId); diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 14a6b4e6..7c441d0f 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -13,12 +13,12 @@ Group=Views (Kopete) ToolTip=List View Search Line (Kopete) WhatsThis=Search line able to use Kopete custom list View. IncludeFile=kopetelistviewsearchline.h -ConstructorArgs=(tqparent, 0, name) +ConstructorArgs=(parent, 0, name) Group=Input (Kopete) [Kopete::UI::AddressBookLinkWidget] ToolTip=Address Book Link Widget (Kopete) WhatsThis=KABC::Addressee display/selector IncludeFile=addressbooklinkwidget.h -ConstructorArgs=(tqparent, name) +ConstructorArgs=(parent, name) Group=Input (Kopete) diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index c3938aff..6492d1c0 100644 --- a/kopete/libkopete/ui/kopetecontactaction.cpp +++ b/kopete/libkopete/ui/kopetecontactaction.cpp @@ -22,9 +22,9 @@ #include "kopeteonlinestatus.h" KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver, - const char *slot, KAction *tqparent ) + const char *slot, KAction *parent ) : KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(), - tqparent, contact->contactId().latin1() ) + parent, contact->contactId().latin1() ) { m_contact = contact; diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h index 73c39bb7..e87b0437 100644 --- a/kopete/libkopete/ui/kopetecontactaction.h +++ b/kopete/libkopete/ui/kopetecontactaction.h @@ -38,7 +38,7 @@ public: /** * Create a new KopeteContactAction */ - KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* tqparent ); + KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent ); ~KopeteContactAction(); Kopete::Contact * contact() const; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index bf456663..fc9310fa 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -31,8 +31,8 @@ #include "kopetemetacontact.h" #include "kopetecontact.h" -KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *tqparent, const char *name ) -: KDialogBase( tqparent, name, false, i18n( "A User Would Like to Send You a File" ), +KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *parent, const char *name ) +: KDialogBase( parent, name, false, i18n( "A User Would Like to Send You a File" ), KDialogBase::User1 | KDialogBase::User2, KDialogBase::User1, true, i18n( "&Refuse" ), i18n( "&Accept" ) ), m_info( info ) { diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h index 0292f4d7..3a15693d 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.h +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *tqparent=0, const char* name=0); + KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *parent=0, const char* name=0); ~KopeteFileConfirmDialog(); private: diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 91b251a9..cf1fae01 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -47,7 +47,7 @@ namespace ListView { class ToolTip : public TQToolTip { public: - ToolTip( TQWidget *tqparent, ListView *lv ); + ToolTip( TQWidget *parent, ListView *lv ); virtual ~ToolTip(); void maybeTip( const TQPoint &pos ); @@ -56,8 +56,8 @@ private: ListView *m_listView; }; -ToolTip::ToolTip( TQWidget *tqparent, ListView *lv ) - : TQToolTip( tqparent ) +ToolTip::ToolTip( TQWidget *parent, ListView *lv ) + : TQToolTip( parent ) { m_listView = lv; } @@ -102,8 +102,8 @@ struct ListView::Private Private() {} }; -ListView::ListView( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ), d( new Private ) +ListView::ListView( TQWidget *parent, const char *name ) + : KListView( parent, name ), d( new Private ) { connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); @@ -120,7 +120,7 @@ ListView::ListView( TQWidget *tqparent, const char *name ) clearWFlags( WStaticContents ); setWFlags( WNoAutoErase ); - // clear the appropriate flags from the viewport - qt docs say we have to tqmask + // clear the appropriate flags from the viewport - qt docs say we have to mask // these flags out of the TQListView to make weirdly painted list items work, but // that doesn't do the job. masking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h index 05102e53..6dcf4ccc 100644 --- a/kopete/libkopete/ui/kopetelistview.h +++ b/kopete/libkopete/ui/kopetelistview.h @@ -35,7 +35,7 @@ class ListView : public KListView TQ_OBJECT public: - ListView( TQWidget *tqparent = 0, const char *name = 0 ); + ListView( TQWidget *parent = 0, const char *name = 0 ); ~ListView(); /** diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index b4c156fb..6156b6aa 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -144,13 +144,13 @@ void ComponentBase::updateAnimationPosition( int p, int s ) class Component::Private { public: - Private( ComponentBase *tqparent ) - : tqparent( tqparent ), minWidth( 0 ), minHeight( 0 ) + Private( ComponentBase *parent ) + : parent( parent ), minWidth( 0 ), minHeight( 0 ) , growHoriz( false ), growVert( false ) , tipSource( 0 ) { } - ComponentBase *tqparent; + ComponentBase *parent; TQRect rect; TQRect startRect, targetRect; int minWidth, minHeight; @@ -159,10 +159,10 @@ public: ToolTipSource *tipSource; }; -Component::Component( ComponentBase *tqparent ) - : d( new Private( tqparent ) ) +Component::Component( ComponentBase *parent ) + : d( new Private( parent ) ) { - d->tqparent->componentAdded( this ); + d->parent->componentAdded( this ); d->show = true; } @@ -170,7 +170,7 @@ int Component::RTTI = Rtti_Component; Component::~Component() { - d->tqparent->componentRemoved( this ); + d->parent->componentRemoved( this ); delete d; } @@ -224,7 +224,7 @@ bool Component::setMinWidth( int width ) if ( d->minWidth == width ) return false; d->minWidth = width; - d->tqparent->componentResized( this ); + d->parent->componentResized( this ); return true; } bool Component::setMinHeight( int height ) @@ -232,7 +232,7 @@ bool Component::setMinHeight( int height ) if ( d->minHeight == height ) return false; d->minHeight = height; - d->tqparent->componentResized( this ); + d->parent->componentResized( this ); return true; } @@ -264,12 +264,12 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg ) void Component::tqrepaint() { - d->tqparent->tqrepaint(); + d->parent->tqrepaint(); } void Component::retqlayout() { - d->tqparent->retqlayout(); + d->parent->retqlayout(); } void Component::componentAdded( Component *component ) @@ -295,8 +295,8 @@ public: static const int padding = 0; }; -BoxComponent::BoxComponent( ComponentBase *tqparent, Direction dir ) - : Component( tqparent ), d( new Private( dir ) ) +BoxComponent::BoxComponent( ComponentBase *parent, Direction dir ) + : Component( parent ), d( new Private( dir ) ) { } @@ -482,8 +482,8 @@ public: TQPixmap bottom_pixmap; }; -ContactBoxComponent::ContactBoxComponent(ComponentBase *tqparent, Direction dir) - : BoxComponent(tqparent, dir), d(new Private()) +ContactBoxComponent::ContactBoxComponent(ComponentBase *parent, Direction dir) + : BoxComponent(parent, dir), d(new Private()) {} ContactBoxComponent::~ContactBoxComponent() @@ -620,8 +620,8 @@ public: TQPixmap bottom_pixmap; }; -GroupBoxComponent::GroupBoxComponent(ComponentBase *tqparent, Direction dir) - : BoxComponent(tqparent, dir), d(new Private()) +GroupBoxComponent::GroupBoxComponent(ComponentBase *parent, Direction dir) + : BoxComponent(parent, dir), d(new Private()) {} GroupBoxComponent::~GroupBoxComponent() @@ -746,15 +746,15 @@ public: TQPixmap image; }; -ImageComponent::ImageComponent( ComponentBase *tqparent ) - : Component( tqparent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *parent ) + : Component( parent ), d( new Private ) { } int ImageComponent::RTTI = Rtti_ImageComponent; -ImageComponent::ImageComponent( ComponentBase *tqparent, int minW, int minH ) - : Component( tqparent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH ) + : Component( parent ), d( new Private ) { setMinWidth( minW ); setMinHeight( minH ); @@ -858,8 +858,8 @@ public: TQFont font; }; -TextComponent::TextComponent( ComponentBase *tqparent, const TQFont &font, const TQString &text ) - : Component( tqparent ), d( new Private ) +TextComponent::TextComponent( ComponentBase *parent, const TQFont &font, const TQString &text ) + : Component( parent ), d( new Private ) { setFont( font ); setText( text ); @@ -956,8 +956,8 @@ public: TQFont font; }; -DisplayNameComponent::DisplayNameComponent( ComponentBase *tqparent ) - : BoxComponent( tqparent ), d( new Private ) +DisplayNameComponent::DisplayNameComponent( ComponentBase *parent ) + : BoxComponent( parent ), d( new Private ) { } @@ -1092,8 +1092,8 @@ TQString DisplayNameComponent::text() // HSpacerComponent -------- -HSpacerComponent::HSpacerComponent( ComponentBase *tqparent ) - : Component( tqparent ) +HSpacerComponent::HSpacerComponent( ComponentBase *parent ) + : Component( parent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1108,8 +1108,8 @@ int HSpacerComponent::widthForHeight( int ) // VSpacerComponent -------- -VSpacerComponent::VSpacerComponent( ComponentBase *tqparent ) - : Component( tqparent ) +VSpacerComponent::VSpacerComponent( ComponentBase *parent ) + : Component( parent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1131,7 +1131,7 @@ public: int iconSize; }; -ContactComponent::ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int) : ImageComponent( tqparent ) , d( new Private ) +ContactComponent::ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int) : ImageComponent( parent ) , d( new Private ) { d->contact = contact; d->iconSize = 12; // size of the image is fixed to 12 pixels @@ -1160,7 +1160,7 @@ std::pair<TQString,TQRect> ContactComponent::toolTip( const TQPoint &/*relativeP ////////////////// SpacerComponent ///////////////////////// -SpacerComponent::SpacerComponent( ComponentBase *tqparent, int w, int h ) : Component( tqparent ) +SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Component( parent ) { setMinWidth(w); setMinHeight(h); @@ -1279,14 +1279,14 @@ bool Item::Private::animateChanges = true; bool Item::Private::fadeVisibility = true; bool Item::Private::foldVisibility = true; -Item::Item( TQListViewItem *tqparent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) +Item::Item( TQListViewItem *parent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) { initLVI(); } -Item::Item( TQListView *tqparent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) +Item::Item( TQListView *parent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) { initLVI(); } @@ -1411,7 +1411,7 @@ void Item::setTargetVisibility( bool vis ) { if ( d->visibilityTarget == vis ) { - // in case we're getting called because our tqparent was shown and + // in case we're getting called because our parent was shown and // we need to be rehidden if ( !d->visibilityTimer.isActive() ) setVisible( vis && d->searchMatch ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index ac19c4b8..0868afab 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -102,7 +102,7 @@ public: class Component : public ComponentBase { protected: - Component( ComponentBase *tqparent ); + Component( ComponentBase *parent ); public: virtual ~Component() = 0; @@ -110,7 +110,7 @@ public: * Set the size and position of this item relative to the list view item. Should * only be called by the containing item. * @param rect the new rectangle this component will paint in, relative to the painter - * passed to the paint() function by the tqparent item. + * passed to the paint() function by the parent item. */ virtual void tqlayout( const TQRect &rect ); @@ -200,7 +200,7 @@ protected: * @param width the minimum width * @return true if the size has actually changed, false if it's been set to * the existing values. if it returns true, you do not need to retqlayout, - * since the tqparent component will do that for you. + * since the parent component will do that for you. */ bool setMinWidth( int width ); /** @@ -209,7 +209,7 @@ protected: * @param height the minimum height * @return true if the size has actually changed, false if it's been set to * the existing values. If it returns true, you do not need to retqlayout, - * since the tqparent component will do that for you. + * since the parent component will do that for you. */ bool setMinHeight( int height ); @@ -233,7 +233,7 @@ class BoxComponent : public Component { public: enum Direction {Horizontal,Vertical }; - BoxComponent( ComponentBase *tqparent, Direction dir =Horizontal ); + BoxComponent( ComponentBase *parent, Direction dir =Horizontal ); ~BoxComponent(); virtual void tqlayout( const TQRect &rect ); @@ -262,7 +262,7 @@ private: class ContactBoxComponent : public BoxComponent { public: - ContactBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); + ContactBoxComponent(ComponentBase *parent, Direction dir =Horizontal); ~ContactBoxComponent(); virtual void reloadTheme(); @@ -285,7 +285,7 @@ private: class GroupBoxComponent : public BoxComponent { public: - GroupBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); + GroupBoxComponent(ComponentBase *parent, Direction dir =Horizontal); ~GroupBoxComponent(); virtual void reloadTheme(); @@ -305,7 +305,7 @@ private: class TextComponent : public Component { public: - TextComponent( ComponentBase *tqparent, const TQFont &font = TQFont(), const TQString &text = TQString() ); + TextComponent( ComponentBase *parent, const TQFont &font = TQFont(), const TQString &text = TQString() ); ~TextComponent(); TQString text(); @@ -335,8 +335,8 @@ private: class ImageComponent : public Component { public: - ImageComponent( ComponentBase *tqparent ); - ImageComponent( ComponentBase *tqparent, int minW, int minH ); + ImageComponent( ComponentBase *parent ); + ImageComponent( ComponentBase *parent, int minW, int minH ); ~ImageComponent(); virtual void setPixmap( const TQPixmap &img, bool adjustSize = true); @@ -358,8 +358,8 @@ protected: class FaceComponent : public ImageComponent { public: - FaceComponent(ComponentBase *tqparent): ImageComponent(tqparent) {} - FaceComponent(ComponentBase *tqparent, int minW, int minH): ImageComponent(tqparent, minH, minW) {} + FaceComponent(ComponentBase *parent): ImageComponent(parent) {} + FaceComponent(ComponentBase *parent, int minW, int minH): ImageComponent(parent, minH, minW) {} void setPixmap(const TQPixmap &img, bool adjustSize = true); void paint(TQPainter *painter, const TQColorGroup &cg); @@ -371,7 +371,7 @@ public: class ContactComponent : public ImageComponent { public: - ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int iconSize); + ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int iconSize); ~ContactComponent(); void updatePixmap(); Kopete::Contact *contact(); @@ -387,7 +387,7 @@ protected: class SpacerComponent : public Component { public: - SpacerComponent( ComponentBase *tqparent, int w, int h ); + SpacerComponent( ComponentBase *parent, int w, int h ); }; /** @@ -400,7 +400,7 @@ public: /** * Constructor */ - DisplayNameComponent( ComponentBase *tqparent ); + DisplayNameComponent( ComponentBase *parent ); /** * Dtor @@ -428,7 +428,7 @@ private: class HSpacerComponent : public Component { public: - HSpacerComponent( ComponentBase *tqparent ); + HSpacerComponent( ComponentBase *parent ); int widthForHeight( int ); static int RTTI; @@ -438,7 +438,7 @@ public: class VSpacerComponent : public Component { public: - VSpacerComponent( ComponentBase *tqparent ); + VSpacerComponent( ComponentBase *parent ); int heightForWidth( int ); static int RTTI; @@ -456,8 +456,8 @@ class Item : public TQObject, public KListViewItem, public ComponentBase Q_OBJECT TQ_OBJECT public: - Item( TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); - Item( TQListViewItem *tqparent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 ); ~Item(); void tqrepaint(); diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp index 1ab9c398..af626858 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp +++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp @@ -24,13 +24,13 @@ namespace Kopete { namespace UI { namespace ListView { -SearchLine::SearchLine( TQWidget *tqparent, ListView *listView, const char *name ) - : KListViewSearchLine( tqparent, listView, name ) +SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name ) + : KListViewSearchLine( parent, listView, name ) { } -SearchLine::SearchLine(TQWidget *tqparent, const char *name) - : KListViewSearchLine( tqparent, 0, name ) +SearchLine::SearchLine(TQWidget *parent, const char *name) + : KListViewSearchLine( parent, 0, name ) { } diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h index 799337e8..c30cc90f 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.h +++ b/kopete/libkopete/ui/kopetelistviewsearchline.h @@ -38,12 +38,12 @@ public: * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - SearchLine( TQWidget *tqparent, ListView *listView = 0, const char *name = 0 ); + SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 ); /** * Constructs a SearchLine without any ListView to filter. The * KListView object has to be set later with setListView(). */ - SearchLine(TQWidget *tqparent, const char *name); + SearchLine(TQWidget *parent, const char *name); /** * Destroys the SearchLine. */ diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp index dd798363..23a48d00 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.cpp +++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp @@ -28,8 +28,8 @@ public: uint maxLength; }; -Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *tqparent, const char *name, Kopete::Password *from ) - : KopetePasswordWidgetBase( tqparent, name ), d( new Private ) +Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *parent, const char *name, Kopete::Password *from ) + : KopetePasswordWidgetBase( parent, name ), d( new Private ) { load( from ); } diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h index e8c45a90..d4ad2c11 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.h +++ b/kopete/libkopete/ui/kopetepasswordwidget.h @@ -42,11 +42,11 @@ class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase public: /** * Creates a Kopete::PasswordWidget. - * @param tqparent The widget to nest this one inside + * @param parent The widget to nest this one inside * @param name The name of this TQObject * @param from The password to load the data for this widget from, or 0 if none */ - PasswordWidget( TQWidget *tqparent, const char *name = 0, Kopete::Password *from = 0 ); + PasswordWidget( TQWidget *parent, const char *name = 0, Kopete::Password *from = 0 ); ~PasswordWidget(); /** diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index cd8f2326..d9a6a632 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -36,12 +36,12 @@ KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L; -KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name ) +KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name ) #if KDE_IS_VERSION( 3, 3, 90 ) -: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name ) +: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) #else : KAction( KGuiItem( i18n( "&Configure Kopete..." ), - TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, name ) + TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, parent, name ) #endif { connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) ); @@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences() KWin::activateWindow( s_settingsDialog->dialog()->winId() ); } -KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name ) +KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name ) { - return new KopetePreferencesAction( tqparent, name ); + return new KopetePreferencesAction( parent, name ); } -KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, tqparent, name ); + return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name ); } -KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) +KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) +KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) { - return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); } -KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) +KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) { - return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, tqparent, name ); + return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, parent, name ); } #include "kopetestdaction.moc" diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h index 06bb40eb..c4941e20 100644 --- a/kopete/libkopete/ui/kopetestdaction.h +++ b/kopete/libkopete/ui/kopetestdaction.h @@ -35,64 +35,64 @@ public: * Standard action to start a chat */ static KAction *chat( const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0 ); + TQObject* parent, const char *name = 0 ); /** * Standard action to send a single message */ static KAction *sendMessage(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to open a user info dialog */ static KAction *contactInfo(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to open a history dialog or something similar */ static KAction *viewHistory(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to initiate sending a file to a contact */ static KAction *sendFile(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to change a contacts @ref Kopete::MetaContact */ static KAction *changeMetaContact(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to add a group */ static KAction *addGroup(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to delete a contact */ static KAction *deleteContact(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to change a contact alias/nickname in your contactlist */ static KAction *changeAlias(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to block a contact */ static KAction *blockContact(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Standard action to unblock a contact */ static KAction *unblockContact(const TQObject *recvr, const char *slot, - TQObject* tqparent, const char *name = 0); + TQObject* parent, const char *name = 0); /** * Return an action to change the Kopete preferences. * * The object has no signal/slot, the prefs are automatically shown */ - static KAction *preferences(KActionCollection *tqparent, const char *name = 0); + static KAction *preferences(KActionCollection *parent, const char *name = 0); }; @@ -107,7 +107,7 @@ class KOPETE_EXPORT KopetePreferencesAction : public KAction TQ_OBJECT public: - KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 ); + KopetePreferencesAction( KActionCollection *parent, const char *name = 0 ); ~KopetePreferencesAction(); protected slots: diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h index 99655e39..c54b1dba 100644 --- a/kopete/libkopete/ui/kopeteview.h +++ b/kopete/libkopete/ui/kopeteview.h @@ -31,7 +31,7 @@ namespace Kopete /** * @author Jason Keirstead * - * Abstract tqparent class for all types of views used for messaging.These view objects + * Abstract parent class for all types of views used for messaging.These view objects * are provided by a @ref Kopete::ViewPlugin * * @see Kopete::ViewPlugin @@ -42,7 +42,7 @@ class KOPETE_EXPORT KopeteView /** * constructor */ - KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *tqparent ); + KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *parent ); virtual ~KopeteView(); /** diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index d1d0375e..843fe939 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.cpp +++ b/kopete/libkopete/ui/kopeteviewplugin.cpp @@ -16,8 +16,8 @@ #include "kopeteviewplugin.h" -Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *tqparent, const char *name ) : - Kopete::Plugin( instance, tqparent, name ) +Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : + Kopete::Plugin( instance, parent, name ) { } diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index ccef3950..25ce704b 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.h +++ b/kopete/libkopete/ui/kopeteviewplugin.h @@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin /** * @brief Create and initialize the plugin */ - ViewPlugin( KInstance *instance, TQObject *tqparent = 0L, const char *name = 0L ); + ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); /** * @brief Creates a view to be associated with the passed in session diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index e424dc45..4b03f729 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -28,7 +28,7 @@ public: return result; } - virtual TQWidget *create(const TQString &key, TQWidget *tqparent = 0, const char *name = 0); + virtual TQWidget *create(const TQString &key, TQWidget *parent = 0, const char *name = 0); virtual TQIconSet iconSet(const TQString &key) const { @@ -113,17 +113,17 @@ KopeteWidgets::~KopeteWidgets() { } -TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *tqparent, const char *name) +TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name) { if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget")) - return new Kopete::UI::AddressBookLinkWidget(tqparent, name); + return new Kopete::UI::AddressBookLinkWidget(parent, name); if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView")) - return new Kopete::UI::ListView::ListView(tqparent, name); + return new Kopete::UI::ListView::ListView(parent, name); if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine")) - return new Kopete::UI::ListView::SearchLine(tqparent, 0, name); + return new Kopete::UI::ListView::SearchLine(parent, 0, name); return 0; } diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 6da2b351..425b1be8 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -68,7 +68,7 @@ public: }; -MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(tqparent, owner, name) , d( new Private() ) +MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(parent, owner, name) , d( new Private() ) { d->metaContact = mc; d->photoSize = 60; @@ -181,8 +181,8 @@ public: }; -MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), d( new Private() ) +MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), d( new Private() ) { TQBoxLayout *l = new TQVBoxLayout(this); d->widget = new MetaContactSelectorWidget_Base(this); diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h index cc30f83f..0335ac62 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.h +++ b/kopete/libkopete/ui/metacontactselectorwidget.h @@ -40,7 +40,7 @@ class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - MetaContactSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); + MetaContactSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); ~MetaContactSelectorWidget(); Kopete::MetaContact* metaContact(); /** @@ -83,7 +83,7 @@ class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item Q_OBJECT TQ_OBJECT public: - MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); + MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 ); Kopete::MetaContact* metaContact(); virtual TQString text ( int column ) const; protected slots: diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp index 0e47a0d4..d6f93a8a 100644 --- a/kopete/libkopete/webcamwidget.cpp +++ b/kopete/libkopete/webcamwidget.cpp @@ -23,8 +23,8 @@ namespace Kopete { -WebcamWidget::WebcamWidget( TQWidget* tqparent, const char* name ) -: TQWidget( tqparent, name ) +WebcamWidget::WebcamWidget( TQWidget* parent, const char* name ) +: TQWidget( parent, name ) { clear(); } diff --git a/kopete/libkopete/webcamwidget.h b/kopete/libkopete/webcamwidget.h index 663c7723..8b217897 100644 --- a/kopete/libkopete/webcamwidget.h +++ b/kopete/libkopete/webcamwidget.h @@ -35,10 +35,10 @@ Q_OBJECT public: /** * @brief WebcamWidget constructor. - * @param tqparent The tqparent widget of this widget + * @param parent The parent widget of this widget * @param name The name for this TQObject */ - WebcamWidget( TQWidget* tqparent = 0, const char* name = 0 ); + WebcamWidget( TQWidget* parent = 0, const char* name = 0 ); ~WebcamWidget(); /** diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 149eab7a..65e808f4 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -39,8 +39,8 @@ static bool isURLInGroup(const KURL& url, const KBookmarkGroup& group) return false; } -BookmarksPlugin::BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : Kopete::Plugin(BookmarksPluginFactory::instance(), tqparent, name) +BookmarksPlugin::BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &/*args*/) + : Kopete::Plugin(BookmarksPluginFactory::instance(), parent, name) { //kdDebug(14501) << "plugin loading" << endl; connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, TQT_SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) ); diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h index 404fe994..187aae0f 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.h +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h @@ -29,7 +29,7 @@ class BookmarksPlugin : public Kopete::Plugin Q_OBJECT TQ_OBJECT public: - BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &args); + BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &args); private: typedef struct S_URLANDNAME{ diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index 5e1235f6..a6175750 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -26,8 +26,8 @@ typedef KGenericFactory<BookmarksPreferences> BookmarksPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") ) -BookmarksPreferences::BookmarksPreferences(TQWidget *tqparent, const char *name, const TQStringList &args) - : KCModule(BookmarksPreferencesFactory::instance(), tqparent, args) +BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args) + : KCModule(BookmarksPreferencesFactory::instance(), parent, args) { Q_UNUSED( name ); ( new TQVBoxLayout (this) )->setAutoAdd( true ); diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h index 2702de8a..ad9a6fb8 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h @@ -24,7 +24,7 @@ class BookmarksPreferences : public KCModule Q_OBJECT TQ_OBJECT public: - BookmarksPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + BookmarksPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); ~BookmarksPreferences(); diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 3fd4fb3c..34d921c3 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -15,8 +15,8 @@ #include "addbookmarksprefssettings.h" -BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *parent, const char *name) + : TQObject(parent, name) { load(); } diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h index d4bd4c0b..03925f1a 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h @@ -25,7 +25,7 @@ Q_OBJECT public: enum UseSubfolders { Always=0, Never=1, SelectedContacts=2, UnselectedContacts=3 }; - BookmarksPrefsSettings(TQObject *tqparent = 0, const char *name = 0); + BookmarksPrefsSettings(TQObject *parent = 0, const char *name = 0); ~BookmarksPrefsSettings(); diff --git a/kopete/plugins/alias/aliasplugin.cpp b/kopete/plugins/alias/aliasplugin.cpp index 4158e3cf..4824e2fb 100644 --- a/kopete/plugins/alias/aliasplugin.cpp +++ b/kopete/plugins/alias/aliasplugin.cpp @@ -17,8 +17,8 @@ typedef KGenericFactory<AliasPlugin> AliasPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_alias, AliasPluginFactory( "kopete_alias" ) ) AliasPlugin * AliasPlugin::pluginStatic_ = 0L; -AliasPlugin::AliasPlugin( TQObject *tqparent, const char * name, const TQStringList & ) - : Kopete::Plugin( AliasPluginFactory::instance(), tqparent, name ) +AliasPlugin::AliasPlugin( TQObject *parent, const char * name, const TQStringList & ) + : Kopete::Plugin( AliasPluginFactory::instance(), parent, name ) { if( !pluginStatic_ ) pluginStatic_ = this; diff --git a/kopete/plugins/alias/aliasplugin.h b/kopete/plugins/alias/aliasplugin.h index f961fac4..213e7ba7 100644 --- a/kopete/plugins/alias/aliasplugin.h +++ b/kopete/plugins/alias/aliasplugin.h @@ -20,7 +20,7 @@ class AliasPlugin : public Kopete::Plugin public: static AliasPlugin *plugin(); - AliasPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + AliasPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~AliasPlugin(); private: diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 8a651288..3826b869 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -35,11 +35,11 @@ typedef KGenericFactory<AliasPreferences> AliasPreferencesFactory; class AliasItem : public TQListViewItem { public: - AliasItem( TQListView *tqparent, + AliasItem( TQListView *parent, uint number, const TQString &alias, const TQString &command, const ProtocolList &p ) : - TQListViewItem( tqparent, alias, command ) + TQListViewItem( parent, alias, command ) { protocolList = p; id = number; @@ -107,8 +107,8 @@ class AliasItem : public TQListViewItem class ProtocolItem : public TQListViewItem { public: - ProtocolItem( TQListView *tqparent, KPluginInfo *p ) : - TQListViewItem( tqparent, p->name() ) + ProtocolItem( TQListView *parent, KPluginInfo *p ) : + TQListViewItem( parent, p->name() ) { this->setPixmap( 0, SmallIcon( p->icon() ) ); id = p->pluginName(); @@ -119,8 +119,8 @@ class ProtocolItem : public TQListViewItem K_EXPORT_COMPONENT_FACTORY( kcm_kopete_alias, AliasPreferencesFactory( "kcm_kopete_alias" ) ) -AliasPreferences::AliasPreferences( TQWidget *tqparent, const char *, const TQStringList &args ) - : KCModule( AliasPreferencesFactory::instance(), tqparent, args ) +AliasPreferences::AliasPreferences( TQWidget *parent, const char *, const TQStringList &args ) + : KCModule( AliasPreferencesFactory::instance(), parent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new AliasDialogBase( this ); diff --git a/kopete/plugins/alias/aliaspreferences.h b/kopete/plugins/alias/aliaspreferences.h index 99d6a479..24f96573 100644 --- a/kopete/plugins/alias/aliaspreferences.h +++ b/kopete/plugins/alias/aliaspreferences.h @@ -27,7 +27,7 @@ class AliasPreferences : public KCModule TQ_OBJECT public: - AliasPreferences( TQWidget *tqparent = 0, const char *name = 0, + AliasPreferences( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); ~AliasPreferences(); diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp index 356848c0..6acdf153 100644 --- a/kopete/plugins/alias/editaliasdialog.cpp +++ b/kopete/plugins/alias/editaliasdialog.cpp @@ -24,8 +24,8 @@ #include <klistview.h> -EditAliasDialog::EditAliasDialog( TQWidget* tqparent, const char* name ) -: AliasDialog( tqparent, name ) +EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name ) +: AliasDialog( parent, name ) { TQObject::connect( alias, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); TQObject::connect( command, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); diff --git a/kopete/plugins/alias/editaliasdialog.h b/kopete/plugins/alias/editaliasdialog.h index 76d33122..cd444878 100644 --- a/kopete/plugins/alias/editaliasdialog.h +++ b/kopete/plugins/alias/editaliasdialog.h @@ -27,7 +27,7 @@ class EditAliasDialog : public AliasDialog Q_OBJECT TQ_OBJECT public: - EditAliasDialog( TQWidget* tqparent = 0, const char* name = 0 ); + EditAliasDialog( TQWidget* parent = 0, const char* name = 0 ); virtual ~EditAliasDialog(); public slots: diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp index d3470481..586487b8 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp +++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<AutoReplacePlugin> AutoReplacePluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_autoreplace, AutoReplacePluginFactory( "kopete_autoreplace" ) ) AutoReplacePlugin * AutoReplacePlugin::pluginStatic_ = 0L; -AutoReplacePlugin::AutoReplacePlugin( TQObject *tqparent, const char * name, const TQStringList & ) -: Kopete::Plugin( AutoReplacePluginFactory::instance(), tqparent, name ) +AutoReplacePlugin::AutoReplacePlugin( TQObject *parent, const char * name, const TQStringList & ) +: Kopete::Plugin( AutoReplacePluginFactory::instance(), parent, name ) { if( !pluginStatic_ ) pluginStatic_ = this; diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.h b/kopete/plugins/autoreplace/autoreplaceplugin.h index de306a4b..ac8012d0 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.h +++ b/kopete/plugins/autoreplace/autoreplaceplugin.h @@ -43,7 +43,7 @@ class AutoReplacePlugin : public Kopete::Plugin public: static AutoReplacePlugin *plugin(); - AutoReplacePlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + AutoReplacePlugin( TQObject *parent, const char *name, const TQStringList &args ); ~AutoReplacePlugin(); private slots: diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp index 59d79b09..9909b5ee 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp +++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp @@ -36,8 +36,8 @@ typedef KGenericFactory<AutoReplacePreferences> AutoReplacePreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autoreplace, AutoReplacePreferencesFactory( "kcm_kopete_autoreplace" ) ) -AutoReplacePreferences::AutoReplacePreferences( TQWidget *tqparent, const char * /* name */, const TQStringList &args ) -: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), tqparent, args ) +AutoReplacePreferences::AutoReplacePreferences( TQWidget *parent, const char * /* name */, const TQStringList &args ) +: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), parent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new AutoReplacePrefsUI( this ); diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.h b/kopete/plugins/autoreplace/autoreplacepreferences.h index 72e0b548..b2f504d7 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.h +++ b/kopete/plugins/autoreplace/autoreplacepreferences.h @@ -35,7 +35,7 @@ class AutoReplacePreferences : public KCAutoConfigModule TQ_OBJECT public: - AutoReplacePreferences( TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); + AutoReplacePreferences( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); ~AutoReplacePreferences(); virtual void save(); diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index 79920c88..e540277e 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -28,8 +28,8 @@ typedef KGenericFactory<ConnectionStatusPlugin> ConnectionStatusPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_connectionstatus, ConnectionStatusPluginFactory( "kopete_connectionstatus" ) ) -ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList& /* args */ ) -: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), tqparent, name ) +ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList& /* args */ ) +: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), parent, name ) { kdDebug( 14301 ) << k_funcinfo << endl; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h index 50148b0a..e0efdb9a 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.h +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h @@ -32,7 +32,7 @@ class ConnectionStatusPlugin : public Kopete::Plugin TQ_OBJECT public: - ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~ConnectionStatusPlugin(); private slots: diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp index aaa4ee7a..ce67e663 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.cpp +++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<ContactNotesPlugin> ContactNotesPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_contactnotes, ContactNotesPluginFactory( "kopete_contactnotes" ) ) -ContactNotesPlugin::ContactNotesPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( ContactNotesPluginFactory::instance(), tqparent, name ) +ContactNotesPlugin::ContactNotesPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( ContactNotesPluginFactory::instance(), parent, name ) { if ( pluginStatic_ ) kdDebug(14302)<<"ContactNotesPlugin::ContactNotesPlugin : plugin already initialized"<<endl; diff --git a/kopete/plugins/contactnotes/contactnotesplugin.h b/kopete/plugins/contactnotes/contactnotesplugin.h index 1adadd96..1b3177e6 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.h +++ b/kopete/plugins/contactnotes/contactnotesplugin.h @@ -45,7 +45,7 @@ class ContactNotesPlugin : public Kopete::Plugin public: static ContactNotesPlugin *plugin(); - ContactNotesPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + ContactNotesPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~ContactNotesPlugin(); TQString notes(Kopete::MetaContact *m); diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index fecb025e..11f30f48 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -27,16 +27,16 @@ class CryptographyPlugin; -CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *tqparent ) - : TQObject(tqparent) , KXMLGUIClient(tqparent) +CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent ) + : TQObject(parent) , KXMLGUIClient(parent) { - if(!tqparent || tqparent->members().isEmpty()) + if(!parent || parent->members().isEmpty()) { deleteLater(); //we refuse to build this client, it is based on wrong parametters return; } - TQPtrList<Kopete::Contact> mb=tqparent->members(); + TQPtrList<Kopete::Contact> mb=parent->members(); Kopete::MetaContact *first=mb.first()->metaContact(); if(!first) @@ -60,7 +60,7 @@ CryptographyGUIClient::~CryptographyGUIClient() void CryptographyGUIClient::slotToggled() { - TQPtrList<Kopete::Contact> mb=static_cast<Kopete::ChatSession*>(tqparent())->members(); + TQPtrList<Kopete::Contact> mb=static_cast<Kopete::ChatSession*>(parent())->members(); Kopete::MetaContact *first=mb.first()->metaContact(); if(!first) diff --git a/kopete/plugins/cryptography/cryptographyguiclient.h b/kopete/plugins/cryptography/cryptographyguiclient.h index 5b8b22ed..000ca880 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.h +++ b/kopete/plugins/cryptography/cryptographyguiclient.h @@ -29,7 +29,7 @@ class CryptographyGUIClient : public TQObject, public KXMLGUIClient Q_OBJECT TQ_OBJECT public: - CryptographyGUIClient(Kopete::ChatSession *tqparent = 0); + CryptographyGUIClient(Kopete::ChatSession *parent = 0); ~CryptographyGUIClient(); private: diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 7b2cb8bf..4605391f 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory; static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_cryptography, CryptographyPluginFactory( &aboutdata ) ) -CryptographyPlugin::CryptographyPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( CryptographyPluginFactory::instance(), tqparent, name ), +CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( CryptographyPluginFactory::instance(), parent, name ), m_cachedPass() { if( !pluginStatic_ ) diff --git a/kopete/plugins/cryptography/cryptographyplugin.h b/kopete/plugins/cryptography/cryptographyplugin.h index 249eac9e..a75d9833 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.h +++ b/kopete/plugins/cryptography/cryptographyplugin.h @@ -56,7 +56,7 @@ public: static bool passphraseHandling(); static const TQRegExp isHTML; - CryptographyPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + CryptographyPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~CryptographyPlugin(); public slots: diff --git a/kopete/plugins/cryptography/cryptographypreferences.cpp b/kopete/plugins/cryptography/cryptographypreferences.cpp index 765fb098..8e1b96ee 100644 --- a/kopete/plugins/cryptography/cryptographypreferences.cpp +++ b/kopete/plugins/cryptography/cryptographypreferences.cpp @@ -27,8 +27,8 @@ typedef KGenericFactory<CryptographyPreferences> CryptographyPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_cryptography, CryptographyPreferencesFactory("kcm_kopete_cryptography")) -CryptographyPreferences::CryptographyPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCAutoConfigModule(CryptographyPreferencesFactory::instance(), tqparent, args) +CryptographyPreferences::CryptographyPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCAutoConfigModule(CryptographyPreferencesFactory::instance(), parent, args) { // Add actuall widget generated from ui file. preferencesDialog = new CryptographyPrefsUI(this); diff --git a/kopete/plugins/cryptography/cryptographypreferences.h b/kopete/plugins/cryptography/cryptographypreferences.h index d032bc6e..a206f826 100644 --- a/kopete/plugins/cryptography/cryptographypreferences.h +++ b/kopete/plugins/cryptography/cryptographypreferences.h @@ -31,7 +31,7 @@ class CryptographyPreferences : public KCAutoConfigModule { Q_OBJECT TQ_OBJECT public: - CryptographyPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + CryptographyPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); private: CryptographyPrefsUI *preferencesDialog; private slots: // Public slots diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index f4d4072f..e095c0e8 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -38,7 +38,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////// Secret key selection dialog, used when user wants to sign a key -KgpgSelKey::KgpgSelKey(TQWidget *tqparent, const char *name,bool showlocal):KDialogBase( tqparent, name, true,i18n("Private Key List"),Ok | Cancel) +KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { TQString keyname; TQWidget *page = new TQWidget(this); @@ -201,8 +201,8 @@ void KgpgSelKey::slotSelect(TQListViewItem *item) if (item==NULL) return; if (item->depth()!=0) { - keysListpr->setSelected(item->tqparent(),true); - keysListpr->setCurrentItem(item->tqparent()); + keysListpr->setSelected(item->parent(),true); + keysListpr->setCurrentItem(item->parent()); } } diff --git a/kopete/plugins/cryptography/kgpgselkey.h b/kopete/plugins/cryptography/kgpgselkey.h index 190e8186..659c7043 100644 --- a/kopete/plugins/cryptography/kgpgselkey.h +++ b/kopete/plugins/cryptography/kgpgselkey.h @@ -44,7 +44,7 @@ class KgpgSelKey : public KDialogBase TQ_OBJECT public: - KgpgSelKey( TQWidget *tqparent = 0, const char *name = 0,bool showlocal=true); + KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true); KListView *keysListpr; TQPixmap keyPair; TQCheckBox *local; diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index d3d3ecd7..493f3575 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -57,14 +57,14 @@ class UpdateViewItem2 : public KListViewItem { public: - UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault); + UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); virtual void paintCell(TQPainter *p, const TQColorGroup &cg,int col, int width, int align); virtual TQString key(int c,bool ) const; bool def; }; -UpdateViewItem2::UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault) - : KListViewItem(tqparent) +UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) + : KListViewItem(parent) { def=isDefault; setText(0,name); @@ -90,8 +90,8 @@ TQString UpdateViewItem2 :: key(int c,bool ) const /////////////// main view -popupPublic::popupPublic(TQWidget *tqparent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): -KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqparent, name,true) +popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): +KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) { TQWidget *page = plainPage(); TQVBoxLayout *vbox=new TQVBoxLayout(page,0,spacingHint()); diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h index 17c05ebb..0a3acfac 100644 --- a/kopete/plugins/cryptography/popuppublic.h +++ b/kopete/plugins/cryptography/popuppublic.h @@ -37,7 +37,7 @@ class popupPublic : public KDialogBase //TQDialog TQ_OBJECT public: - popupPublic(TQWidget *tqparent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); + popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); ~popupPublic(); KListView *keysList; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; diff --git a/kopete/plugins/highlight/highlightplugin.cpp b/kopete/plugins/highlight/highlightplugin.cpp index 4eee907e..69d6f4a2 100644 --- a/kopete/plugins/highlight/highlightplugin.cpp +++ b/kopete/plugins/highlight/highlightplugin.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<HighlightPlugin> HighlightPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_highlight, HighlightPluginFactory( "kopete_highlight" ) ) -HighlightPlugin::HighlightPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( HighlightPluginFactory::instance(), tqparent, name ) +HighlightPlugin::HighlightPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( HighlightPluginFactory::instance(), parent, name ) { if( !pluginStatic_ ) pluginStatic_=this; diff --git a/kopete/plugins/highlight/highlightplugin.h b/kopete/plugins/highlight/highlightplugin.h index 866e69d1..e9ba7a6d 100644 --- a/kopete/plugins/highlight/highlightplugin.h +++ b/kopete/plugins/highlight/highlightplugin.h @@ -48,7 +48,7 @@ class HighlightPlugin : public Kopete::Plugin public: static HighlightPlugin *plugin(); - HighlightPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + HighlightPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~HighlightPlugin(); public slots: diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 128ed822..5e8da39c 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory<HighlightPreferences> HighlightPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_highlight, HighlightPreferencesFactory( "kcm_kopete_highlight" ) ) -HighlightPreferences::HighlightPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(HighlightPreferencesFactory::instance(), tqparent, args) +HighlightPreferences::HighlightPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule(HighlightPreferencesFactory::instance(), parent, args) { donttouch=true; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/plugins/highlight/highlightpreferences.h b/kopete/plugins/highlight/highlightpreferences.h index 8d7d8242..eada93fe 100644 --- a/kopete/plugins/highlight/highlightpreferences.h +++ b/kopete/plugins/highlight/highlightpreferences.h @@ -34,7 +34,7 @@ class HighlightPreferences : public KCModule { TQ_OBJECT public: - HighlightPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HighlightPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~HighlightPreferences(); virtual void save(); diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index e86f08b7..c4f5418f 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -60,7 +60,7 @@ class KListViewDateItem : public KListViewItem { public: - KListViewDateItem(KListView* tqparent, TQDate date, Kopete::MetaContact *mc); + KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc); TQDate date() { return mDate; } Kopete::MetaContact *metaContact() { return mMetaContact; } @@ -73,8 +73,8 @@ private: -KListViewDateItem::KListViewDateItem(KListView* tqparent, TQDate date, Kopete::MetaContact *mc) - : KListViewItem(tqparent, date.toString(Qt::ISODate), mc->displayName()) +KListViewDateItem::KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc) + : KListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) { mDate = date; mMetaContact = mc; @@ -93,8 +93,8 @@ int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const } -HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent, - const char* name) : KDialogBase(tqparent, name, false, +HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, + const char* name) : KDialogBase(parent, name, false, i18n("History for %1").tqarg(mc->displayName()), 0), mSearching(false) { TQString fontSize; diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h index 783bb3a7..a950d384 100644 --- a/kopete/plugins/history/historydialog.h +++ b/kopete/plugins/history/historydialog.h @@ -65,7 +65,7 @@ class HistoryDialog : public KDialogBase TQ_OBJECT public: - HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent=0, + HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent=0, const char* name="HistoryDialog"); ~HistoryDialog(); diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index 57dfdc1c..b8608ac9 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -27,12 +27,12 @@ class HistoryPlugin; -HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *tqparent, const char *name) - : TQObject(tqparent, name), KXMLGUIClient(tqparent) +HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name) + : TQObject(parent, name), KXMLGUIClient(parent) { setInstance(KGenericFactory<HistoryPlugin>::instance()); - m_manager = tqparent; + m_manager = parent; // Refuse to build this client, it is based on wrong parameters if(!m_manager || m_manager->members().isEmpty()) diff --git a/kopete/plugins/history/historyguiclient.h b/kopete/plugins/history/historyguiclient.h index b48595fc..3c09eaf4 100644 --- a/kopete/plugins/history/historyguiclient.h +++ b/kopete/plugins/history/historyguiclient.h @@ -31,7 +31,7 @@ class HistoryGUIClient : public TQObject , public KXMLGUIClient Q_OBJECT TQ_OBJECT public: - HistoryGUIClient(Kopete::ChatSession *tqparent = 0, const char *name = 0); + HistoryGUIClient(Kopete::ChatSession *parent = 0, const char *name = 0); ~HistoryGUIClient(); HistoryLogger *logger() const { return m_logger; } diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index 063ba73d..02bc1b2f 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -37,8 +37,8 @@ #include "kopetechatsession.h" // ----------------------------------------------------------------------------- -HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *tqparent, const char *name ) - : TQObject(tqparent, name) +HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *parent, const char *name ) + : TQObject(parent, name) { m_saveTimer=0L; m_saveTimerTime=0; @@ -55,8 +55,8 @@ HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *tqparent, const } -HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *tqparent, const char *name ) - : TQObject(tqparent, name) +HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *parent, const char *name ) + : TQObject(parent, name) { m_saveTimer=0L; m_saveTimerTime=0; diff --git a/kopete/plugins/history/historylogger.h b/kopete/plugins/history/historylogger.h index 6d01754d..1d7fae61 100644 --- a/kopete/plugins/history/historylogger.h +++ b/kopete/plugins/history/historylogger.h @@ -47,8 +47,8 @@ public: /** * Constructor, takes the contact, and the color of messages */ - HistoryLogger( Kopete::MetaContact *m , TQObject *tqparent = 0, const char *name = 0); - HistoryLogger( Kopete::Contact *c , TQObject *tqparent = 0, const char *name = 0); + HistoryLogger( Kopete::MetaContact *m , TQObject *parent = 0, const char *name = 0); + HistoryLogger( Kopete::Contact *c , TQObject *parent = 0, const char *name = 0); ~HistoryLogger(); diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index 3c83c371..f1401c85 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -41,8 +41,8 @@ typedef KGenericFactory<HistoryPlugin> HistoryPluginFactory; static const KAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) ) -HistoryPlugin::HistoryPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( HistoryPluginFactory::instance(), tqparent, name ), m_loggerFactory( this ) +HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) { KAction *viewMetaContactHistory = new KAction( i18n("View &History" ), TQString::tqfromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), diff --git a/kopete/plugins/history/historyplugin.h b/kopete/plugins/history/historyplugin.h index 560d09b5..e80ce26b 100644 --- a/kopete/plugins/history/historyplugin.h +++ b/kopete/plugins/history/historyplugin.h @@ -76,7 +76,7 @@ class HistoryPlugin : public Kopete::Plugin Q_OBJECT TQ_OBJECT public: - HistoryPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + HistoryPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~HistoryPlugin(); /** diff --git a/kopete/plugins/history/historypreferences.cpp b/kopete/plugins/history/historypreferences.cpp index 959f9653..370e6721 100644 --- a/kopete/plugins/history/historypreferences.cpp +++ b/kopete/plugins/history/historypreferences.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<HistoryPreferences> HistoryConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_history, HistoryConfigFactory( "kcm_kopete_history" ) ) -HistoryPreferences::HistoryPreferences(TQWidget *tqparent, const char*/*name*/, const TQStringList &args) - : KCModule(HistoryConfigFactory::instance(), tqparent, args) +HistoryPreferences::HistoryPreferences(TQWidget *parent, const char*/*name*/, const TQStringList &args) + : KCModule(HistoryConfigFactory::instance(), parent, args) { kdDebug(14310) << k_funcinfo << "called." << endl; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/plugins/history/historypreferences.h b/kopete/plugins/history/historypreferences.h index 848580b2..61339290 100644 --- a/kopete/plugins/history/historypreferences.h +++ b/kopete/plugins/history/historypreferences.h @@ -31,7 +31,7 @@ class HistoryPreferences : public KCModule Q_OBJECT TQ_OBJECT public: - HistoryPreferences(TQWidget *tqparent=0, const char* name=0, + HistoryPreferences(TQWidget *parent=0, const char* name=0, const TQStringList &args = TQStringList()); ~HistoryPreferences(); diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index 19fbe54b..e4062905 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -33,13 +33,13 @@ #include "latexplugin.h" #include "latexguiclient.h" -LatexGUIClient::LatexGUIClient( Kopete::ChatSession *tqparent, const char *name ) -: TQObject( tqparent, name ), KXMLGUIClient( tqparent ) +LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent, const char *name ) +: TQObject( parent, name ), KXMLGUIClient( parent ) { setInstance( LatexPlugin::plugin()->instance() ); connect( LatexPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); - m_manager = tqparent; + m_manager = parent; new KAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); diff --git a/kopete/plugins/latex/latexguiclient.h b/kopete/plugins/latex/latexguiclient.h index 6807ccb8..0b1afac4 100644 --- a/kopete/plugins/latex/latexguiclient.h +++ b/kopete/plugins/latex/latexguiclient.h @@ -40,7 +40,7 @@ class LatexGUIClient : public TQObject , public KXMLGUIClient TQ_OBJECT public: - LatexGUIClient( Kopete::ChatSession *tqparent, const char *name=0L); + LatexGUIClient( Kopete::ChatSession *parent, const char *name=0L); ~LatexGUIClient(); private slots: diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 75ccdaf9..4b0ab594 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -41,8 +41,8 @@ typedef KGenericFactory<LatexPlugin> LatexPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_latex, LatexPluginFactory( "kopete_latex" ) ) -LatexPlugin::LatexPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( LatexPluginFactory::instance(), tqparent, name ) +LatexPlugin::LatexPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( LatexPluginFactory::instance(), parent, name ) { // kdDebug() << k_funcinfo << endl; if( !s_pluginStatic ) diff --git a/kopete/plugins/latex/latexplugin.h b/kopete/plugins/latex/latexplugin.h index 5413626f..1a8fb73d 100644 --- a/kopete/plugins/latex/latexplugin.h +++ b/kopete/plugins/latex/latexplugin.h @@ -47,7 +47,7 @@ class LatexPlugin : public Kopete::Plugin public: static LatexPlugin *plugin(); - LatexPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + LatexPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~LatexPlugin(); public slots: diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp index e7396282..ff02c831 100644 --- a/kopete/plugins/latex/latexpreferences.cpp +++ b/kopete/plugins/latex/latexpreferences.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<LatexPreferences> LatexPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_latex, LatexPreferencesFactory( "kcm_kopete_latex" ) ) -LatexPreferences::LatexPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(LatexPreferencesFactory::instance(), tqparent, args) +LatexPreferences::LatexPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule(LatexPreferencesFactory::instance(), parent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); m_preferencesDialog = new LatexPrefsUI(this); diff --git a/kopete/plugins/latex/latexpreferences.h b/kopete/plugins/latex/latexpreferences.h index 518d0fc6..536bccf5 100644 --- a/kopete/plugins/latex/latexpreferences.h +++ b/kopete/plugins/latex/latexpreferences.h @@ -34,7 +34,7 @@ class LatexPreferences : public KCModule TQ_OBJECT public: - LatexPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + LatexPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~LatexPreferences(); virtual void save(); diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index da4e5431..c4daf886 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -92,8 +92,8 @@ typedef __signed__ long long __s64; typedef KGenericFactory<MotionAwayPlugin> MotionAwayPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_motionaway, MotionAwayPluginFactory( "kopete_motionaway" ) ) -MotionAwayPlugin::MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( MotionAwayPluginFactory::instance(), tqparent, name ) +MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( MotionAwayPluginFactory::instance(), parent, name ) { kdDebug(14305) << k_funcinfo << "Called." << endl; /* This should be read from config someday may be */ diff --git a/kopete/plugins/motionautoaway/motionawayplugin.h b/kopete/plugins/motionautoaway/motionawayplugin.h index c966b832..ebbdcfdf 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.h +++ b/kopete/plugins/motionautoaway/motionawayplugin.h @@ -39,7 +39,7 @@ class MotionAwayPlugin : public Kopete::Plugin TQ_OBJECT public: - MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~MotionAwayPlugin(); public slots: diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp index 46697051..889d4d30 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp +++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<MotionAwayPreferences> MotionAwayPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway")) -MotionAwayPreferences::MotionAwayPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(MotionAwayPreferencesFactory::instance(), tqparent, args) +MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule(MotionAwayPreferencesFactory::instance(), parent, args) { // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h index 246541d5..31ba25e9 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.h +++ b/kopete/plugins/motionautoaway/motionawaypreferences.h @@ -31,7 +31,7 @@ class MotionAwayPreferences : public KCModule Q_OBJECT TQ_OBJECT public: - MotionAwayPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + MotionAwayPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual void save(); virtual void load(); diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index d8daa817..9dffde7f 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -32,11 +32,11 @@ class NetMeetingPlugin; -NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *tqparent, const char *name ) -: TQObject( tqparent, name ) , KXMLGUIClient(tqparent) +NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *name ) +: TQObject( parent, name ) , KXMLGUIClient(parent) { setInstance(KGenericFactory<NetMeetingPlugin>::instance()); - m_manager=tqparent; + m_manager=parent; new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.h b/kopete/plugins/netmeeting/netmeetingguiclient.h index 5c337431..a5cc8cbf 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.h +++ b/kopete/plugins/netmeeting/netmeetingguiclient.h @@ -37,7 +37,7 @@ class NetMeetingGUIClient : public TQObject , public KXMLGUIClient TQ_OBJECT public: - NetMeetingGUIClient( MSNChatSession *tqparent, const char *name=0L); + NetMeetingGUIClient( MSNChatSession *parent, const char *name=0L); ~NetMeetingGUIClient(); private slots: diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 3f068c06..711dc665 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -32,8 +32,8 @@ #include <tqtimer.h> #include <kprocess.h> -NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *tqparent) - : TQObject(tqparent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) +NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *parent) + : TQObject(parent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) { m_contact=c; oki=false; diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.h b/kopete/plugins/netmeeting/netmeetinginvitation.h index 4efe3ed1..8e1be112 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.h +++ b/kopete/plugins/netmeeting/netmeetinginvitation.h @@ -30,7 +30,7 @@ class NetMeetingInvitation : public TQObject , public MSNInvitation Q_OBJECT TQ_OBJECT public: - NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *tqparent = 0); + NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *parent = 0); ~NetMeetingInvitation(); static TQString applicationID() { return "44BBA842-CC51-11CF-AAFA-00AA00B6015C"; } diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 3cdb4b21..2d71c257 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -35,8 +35,8 @@ static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) ) -NetMeetingPlugin::NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( KGlobal::instance(), tqparent, name ) +NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( KGlobal::instance(), parent, name ) { if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); diff --git a/kopete/plugins/netmeeting/netmeetingplugin.h b/kopete/plugins/netmeeting/netmeetingplugin.h index da877926..0d3ca9de 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.h +++ b/kopete/plugins/netmeeting/netmeetingplugin.h @@ -32,7 +32,7 @@ class NetMeetingPlugin : public Kopete::Plugin TQ_OBJECT public: - NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~NetMeetingPlugin(); private slots: diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 1c737cab..313eb197 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory<NetmeetingPreferences> NetmeetingPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" ) ) -NetmeetingPreferences::NetmeetingPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(NetmeetingPreferencesFactory::instance(), tqparent, args) +NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule(NetmeetingPreferencesFactory::instance(), parent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NetmeetingPrefsUI(this); diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h index 2711eab8..47b402f9 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.h +++ b/kopete/plugins/netmeeting/netmeetingpreferences.h @@ -31,7 +31,7 @@ class NetmeetingPreferences : public KCModule { TQ_OBJECT public: - NetmeetingPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + NetmeetingPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~NetmeetingPreferences(); virtual void save(); diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp index ddbf50bd..c5e47ef0 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp @@ -29,11 +29,11 @@ #include <klocale.h> #include <kmessagebox.h> -NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *tqparent, NowListeningPlugin *plugin ) - : TQObject(tqparent) , KXMLGUIClient(tqparent) +NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowListeningPlugin *plugin ) + : TQObject(parent) , KXMLGUIClient(parent) { connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded())); - m_msgManager = tqparent; + m_msgManager = parent; m_action = new KAction( i18n( "Send Media Info" ), 0, this, TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); setXMLFile("nowlisteningchatui.rc"); diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.h b/kopete/plugins/nowlistening/nowlisteningguiclient.h index 7ed37b7e..156c33e5 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.h +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.h @@ -37,7 +37,7 @@ class NowListeningGUIClient : public TQObject, public KXMLGUIClient TQ_OBJECT public: - NowListeningGUIClient( Kopete::ChatSession* tqparent, NowListeningPlugin* plugin ); + NowListeningGUIClient( Kopete::ChatSession* parent, NowListeningPlugin* plugin ); virtual ~NowListeningGUIClient() {} protected slots: diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index b72df2a7..902ea9d2 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -78,8 +78,8 @@ public: typedef KGenericFactory<NowListeningPlugin> NowListeningPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_nowlistening, NowListeningPluginFactory( "kopete_nowlistening" ) ) -NowListeningPlugin::NowListeningPlugin( TQObject *tqparent, const char* name, const TQStringList& /*args*/ ) -: Kopete::Plugin( NowListeningPluginFactory::instance(), tqparent, name ) +NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, const TQStringList& /*args*/ ) +: Kopete::Plugin( NowListeningPluginFactory::instance(), parent, name ) { if ( pluginStatic_ ) kdDebug( 14307 )<<"####"<<"Now Listening already initialized"<<endl; diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.h b/kopete/plugins/nowlistening/nowlisteningplugin.h index 6b7b3d71..b3b57fb5 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.h +++ b/kopete/plugins/nowlistening/nowlisteningplugin.h @@ -42,7 +42,7 @@ class NowListeningPlugin : public Kopete::Plugin friend class NowListeningGUIClient; public: - NowListeningPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + NowListeningPlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~NowListeningPlugin(); static NowListeningPlugin* plugin(); diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp index 6e1751ab..bd0cb983 100644 --- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp +++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp @@ -36,8 +36,8 @@ typedef KGenericFactory<NowListeningPreferences> NowListeningPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_nowlistening, NowListeningPreferencesFactory( "kcm_kopete_nowlistening" ) ) -NowListeningPreferences::NowListeningPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule( NowListeningPreferencesFactory::instance(), tqparent, args ) +NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule( NowListeningPreferencesFactory::instance(), parent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NowListeningPrefsUI( this ); diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.h b/kopete/plugins/nowlistening/nowlisteningpreferences.h index a0881113..332abb05 100644 --- a/kopete/plugins/nowlistening/nowlisteningpreferences.h +++ b/kopete/plugins/nowlistening/nowlisteningpreferences.h @@ -34,7 +34,7 @@ class NowListeningPreferences : public KCModule Q_OBJECT TQ_OBJECT public: - NowListeningPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + NowListeningPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual ~NowListeningPreferences(); virtual void save(); virtual void load(); diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index 01aac790..0aad71d0 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -37,8 +37,8 @@ typedef KGenericFactory<SMPPPDCSPlugin> SMPPPDCSPluginFactory; K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppdcs")) -SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *tqparent, const char * name, const TQStringList& /* args */) - : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), tqparent, name), +SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */) + : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name), m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL), m_onlineInquiry(NULL) { diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h index 13cd8ec3..24697ca7 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.h +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h @@ -56,7 +56,7 @@ public: /** * @brief Creates an <code>SMPPPDCSPlugin</code> instance */ - SMPPPDCSPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + SMPPPDCSPlugin( TQObject *parent, const char *name, const TQStringList &args ); /** * @brief Destroys an <code>SMPPPDCSPlugin</code> instance diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp index 944779f1..3c486135 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp @@ -35,8 +35,8 @@ typedef KGenericFactory<SMPPPDCSPreferences> SMPPPDCSPreferencesFactory; K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs")) -SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * tqparent, const char * /* name */, const TQStringList& args) - : KCModule(SMPPPDCSPreferencesFactory::instance(), tqparent, args), m_ui(NULL) { +SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name */, const TQStringList& args) + : KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) { Kopete::AccountManager * manager = Kopete::AccountManager::self(); (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.h b/kopete/plugins/smpppdcs/smpppdcspreferences.h index 3671d552..f406d2aa 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.h +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.h @@ -49,7 +49,7 @@ public: /** * @brief Creates an <code>SMPPPDCSPreferences</code> instance */ - SMPPPDCSPreferences(TQWidget * tqparent = 0, const char * name = 0, const TQStringList &args = TQStringList()); + SMPPPDCSPreferences(TQWidget * parent = 0, const char * name = 0, const TQStringList &args = TQStringList()); /** * @brief Destroys an <code>SMPPPDCSPreferences</code> instance diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp index f66f9e47..72ec92d0 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp @@ -35,8 +35,8 @@ #include "smpppdcsprefsimpl.h" #include "smpppdsearcher.h" -SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* tqparent, const char* name, WFlags fl) - : SMPPPDCSPrefsBase(tqparent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) { +SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl) + : SMPPPDCSPrefsBase(parent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) { // search for our main-plugin instance Kopete::Plugin * p = Kopete::PluginManager::self()->plugin("kopete_smpppdcs"); diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h index 607197c3..5d013585 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h @@ -39,7 +39,7 @@ class SMPPPDCSPrefs : public SMPPPDCSPrefsBase public: - SMPPPDCSPrefs(TQWidget* tqparent, const char* name = 0, WFlags fl = 0); + SMPPPDCSPrefs(TQWidget* parent, const char* name = 0, WFlags fl = 0); ~SMPPPDCSPrefs(); signals: diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp index a1f5f9a5..44de2552 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp +++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp @@ -18,8 +18,8 @@ #include "smpppdlocationwidget.h" -SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* tqparent, const char* name, WFlags fl) - : SMPPPDLocationWidgetBase(tqparent, name, fl) {} +SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* parent, const char* name, WFlags fl) + : SMPPPDLocationWidgetBase(parent, name, fl) {} SMPPPDLocationWidget::~SMPPPDLocationWidget() {} diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.h b/kopete/plugins/smpppdcs/smpppdlocationwidget.h index 3f0ba866..71393a08 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationwidget.h +++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.h @@ -31,7 +31,7 @@ class SMPPPDLocationWidget : public SMPPPDLocationWidgetBase SMPPPDLocationWidget& operator=(const SMPPPDLocationWidget&); public: - SMPPPDLocationWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0); + SMPPPDLocationWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~SMPPPDLocationWidget(); void setServer(const TQString& serv); diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index 4ec77196..cfb103c2 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -105,8 +105,8 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf /*! \fn SMPPPDSearcher::scan() const */ -bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) { - kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << tqmask << "..." << endl; +bool SMPPPDSearcher::scan(const TQString& ip, const TQString& mask) { + kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << mask << "..." << endl; SMPPPD::Client client; @@ -123,7 +123,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) { uint min_range = 0; uint max_range = 255; - // calculate ip range (only last tqmask entry) + // calculate ip range (only last mask entry) TQRegExp lastRex("([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})"); if(lastRex.exactMatch(ip)) { @@ -134,7 +134,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) { ipToks.push_back(lastRex.cap(i)); } - if(lastRex.exactMatch(tqmask)) { + if(lastRex.exactMatch(mask)) { uint lastWordMask = lastRex.cap(4).toUInt(); if(lastWordMask == 0) { diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h index 1e96f737..e5bb05a1 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.h +++ b/kopete/plugins/smpppdcs/smpppdsearcher.h @@ -60,13 +60,13 @@ protected: * @brief Scans a network for a smpppd * * Scans a network for a smpppd described by - * ip and tqmask. + * ip and mask. * * @param ip the ntwork ip - * @param tqmask the network tqmask + * @param mask the network mask * @return <code>TRUE</code> if an smpppd was found */ - bool scan(const TQString& ip, const TQString& tqmask); + bool scan(const TQString& ip, const TQString& mask); signals: /** diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 59b2da59..1404e075 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -40,8 +40,8 @@ #include "statisticsplugin.h" #include "statisticsdb.h" -StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* tqparent, - const char* name) : KDialogBase(tqparent, name, false, +StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* parent, + const char* name) : KDialogBase(parent, name, false, i18n("Statistics for %1").tqarg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact) { mainWidget = new StatisticsWidget(this); diff --git a/kopete/plugins/statistics/statisticsdialog.h b/kopete/plugins/statistics/statisticsdialog.h index 63d5f499..30d16a33 100644 --- a/kopete/plugins/statistics/statisticsdialog.h +++ b/kopete/plugins/statistics/statisticsdialog.h @@ -41,7 +41,7 @@ class StatisticsDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, TQWidget* tqparent=0, + StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, TQWidget* parent=0, const char* name="StatisticsDialog"); private: TQString generateHTMLChart(const int *hours, const int *hours2, const int *hours3, const TQString & caption, const TQString & color); diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 1d37768f..79135598 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -46,9 +46,9 @@ typedef KGenericFactory<StatisticsPlugin> StatisticsPluginFactory; static const KAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" ); K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata ) ) -StatisticsPlugin::StatisticsPlugin( TQObject *tqparent, const char *name, const TQStringList &) +StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &) : DCOPObject("StatisticsDCOPIface"), - Kopete::Plugin( StatisticsPluginFactory::instance(), tqparent, name ) + Kopete::Plugin( StatisticsPluginFactory::instance(), parent, name ) { diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h index b3b9c9f9..b6c87d85 100644 --- a/kopete/plugins/statistics/statisticsplugin.h +++ b/kopete/plugins/statistics/statisticsplugin.h @@ -102,7 +102,7 @@ class StatisticsPlugin : public Kopete::Plugin, virtual public StatisticsDCOPIfa TQ_OBJECT public: /// Standard plugin constructors - StatisticsPlugin(TQObject *tqparent, const char *name, const TQStringList &args); + StatisticsPlugin(TQObject *parent, const char *name, const TQStringList &args); ~StatisticsPlugin(); /// Method to access m_db member diff --git a/kopete/plugins/texteffect/texteffectplugin.cpp b/kopete/plugins/texteffect/texteffectplugin.cpp index 664a38a8..47bdbc14 100644 --- a/kopete/plugins/texteffect/texteffectplugin.cpp +++ b/kopete/plugins/texteffect/texteffectplugin.cpp @@ -28,8 +28,8 @@ typedef KGenericFactory<TextEffectPlugin> TextEffectPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_texteffect, TextEffectPluginFactory( "kopete_texteffect" ) ) -TextEffectPlugin::TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( TextEffectPluginFactory::instance(), tqparent, name ) +TextEffectPlugin::TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( TextEffectPluginFactory::instance(), parent, name ) { if( !pluginStatic_ ) pluginStatic_=this; diff --git a/kopete/plugins/texteffect/texteffectplugin.h b/kopete/plugins/texteffect/texteffectplugin.h index 4090b6b3..9f4989c1 100644 --- a/kopete/plugins/texteffect/texteffectplugin.h +++ b/kopete/plugins/texteffect/texteffectplugin.h @@ -46,7 +46,7 @@ class TextEffectPlugin : public Kopete::Plugin public: static TextEffectPlugin *plugin(); - TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~TextEffectPlugin(); public slots: diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp index ddbe5f61..d2584328 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.cpp +++ b/kopete/plugins/texteffect/texteffectpreferences.cpp @@ -35,10 +35,10 @@ typedef KGenericFactory<TextEffectPreferences> TextEffectPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_texteffect, TextEffectPreferencesFactory( "kcm_kopete_texteffect" ) ) -TextEffectPreferences::TextEffectPreferences(TQWidget *tqparent, +TextEffectPreferences::TextEffectPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(TextEffectPreferencesFactory::instance(), tqparent, args) + : KCModule(TextEffectPreferencesFactory::instance(), parent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -106,7 +106,7 @@ void TextEffectPreferences::load() preferencesDialog->m_casewaves->setChecked(config->waves()); - // Call tqparent's save method + // Call parent's save method KCModule::load(); // Indicate that we have not changed ^_^ @@ -134,7 +134,7 @@ void TextEffectPreferences::save() // Notify the plugin that the settings have changed //TextEffectPlugin::plugin()->slotSettingsChanged(); - // Call tqparent's save method + // Call parent's save method KCModule::save(); // Indicate that we have not changed ^_^ diff --git a/kopete/plugins/texteffect/texteffectpreferences.h b/kopete/plugins/texteffect/texteffectpreferences.h index eb30faed..7e5c92ed 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.h +++ b/kopete/plugins/texteffect/texteffectpreferences.h @@ -33,10 +33,10 @@ class TextEffectPreferences : public KCModule { TQ_OBJECT public: - TextEffectPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + TextEffectPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~TextEffectPreferences(); - // Overloaded from tqparent + // Overloaded from parent virtual void save(); virtual void load(); virtual void defaults(); diff --git a/kopete/plugins/translator/translatordialog.cpp b/kopete/plugins/translator/translatordialog.cpp index 15c6b7d9..02e405ec 100644 --- a/kopete/plugins/translator/translatordialog.cpp +++ b/kopete/plugins/translator/translatordialog.cpp @@ -21,7 +21,7 @@ #include "translatordialog.h" -TranslatorDialog::TranslatorDialog(const TQString &text,TQWidget *tqparent, const char *name ) : KDialogBase(tqparent,name,true,i18n("Translator Plugin"), Ok) +TranslatorDialog::TranslatorDialog(const TQString &text,TQWidget *parent, const char *name ) : KDialogBase(parent,name,true,i18n("Translator Plugin"), Ok) { m_textEdit=new KTextEdit(this); setMainWidget(m_textEdit); diff --git a/kopete/plugins/translator/translatordialog.h b/kopete/plugins/translator/translatordialog.h index 79c910d0..48734cdc 100644 --- a/kopete/plugins/translator/translatordialog.h +++ b/kopete/plugins/translator/translatordialog.h @@ -34,7 +34,7 @@ class TranslatorDialog : public KDialogBase TQ_OBJECT public: - TranslatorDialog(const TQString &translated, TQWidget *tqparent=0, const char *name=0); + TranslatorDialog(const TQString &translated, TQWidget *parent=0, const char *name=0); ~TranslatorDialog(); TQString translatedText(); diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp index f583fcd1..ef5ac9ac 100644 --- a/kopete/plugins/translator/translatorguiclient.cpp +++ b/kopete/plugins/translator/translatorguiclient.cpp @@ -33,13 +33,13 @@ #include "translatorguiclient.h" #include "translatorlanguages.h" -TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *tqparent, const char *name ) -: TQObject( tqparent, name ), KXMLGUIClient( tqparent ) +TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const char *name ) +: TQObject( parent, name ), KXMLGUIClient( parent ) { setInstance( TranslatorPlugin::plugin()->instance() ); connect( TranslatorPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); - m_manager = tqparent; + m_manager = parent; new KAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h index e292b0e2..2b5f3393 100644 --- a/kopete/plugins/translator/translatorguiclient.h +++ b/kopete/plugins/translator/translatorguiclient.h @@ -40,7 +40,7 @@ class TranslatorGUIClient : public TQObject , public KXMLGUIClient TQ_OBJECT public: - TranslatorGUIClient( Kopete::ChatSession *tqparent, const char *name=0L); + TranslatorGUIClient( Kopete::ChatSession *parent, const char *name=0L); ~TranslatorGUIClient(); private slots: diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 4d6c2d88..751b8294 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( &aboutda K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( "kopete_translator" ) ) #endif -TranslatorPlugin::TranslatorPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( TranslatorPluginFactory::instance(), tqparent, name ) +TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( TranslatorPluginFactory::instance(), parent, name ) { kdDebug( 14308 ) << k_funcinfo << endl; diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h index d7b40a2d..d526fd76 100644 --- a/kopete/plugins/translator/translatorplugin.h +++ b/kopete/plugins/translator/translatorplugin.h @@ -59,7 +59,7 @@ friend class TranslatorGUIClient; public: static TranslatorPlugin *plugin(); - TranslatorPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + TranslatorPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~TranslatorPlugin(); enum TranslateMode diff --git a/kopete/plugins/translator/translatorprefs.cpp b/kopete/plugins/translator/translatorprefs.cpp index 4eca00e6..8d06b49f 100644 --- a/kopete/plugins/translator/translatorprefs.cpp +++ b/kopete/plugins/translator/translatorprefs.cpp @@ -30,7 +30,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_translator, TranslatorConfigFactory( "kcm class TranslatorPreferences : public KCAutoConfigModule { public: - TranslatorPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( TranslatorConfigFactory::instance(), tqparent, args ) + TranslatorPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( TranslatorConfigFactory::instance(), parent, args ) { TranslatorPrefsUI *preferencesDialog = new TranslatorPrefsUI(this); diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index 2755c12a..88de6c07 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory<WebPresencePlugin> WebPresencePluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_webpresence, WebPresencePluginFactory( "kopete_webpresence" ) ) -WebPresencePlugin::WebPresencePlugin( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) - : Kopete::Plugin( WebPresencePluginFactory::instance(), tqparent, name ), +WebPresencePlugin::WebPresencePlugin( TQObject *parent, const char *name, const TQStringList& /*args*/ ) + : Kopete::Plugin( WebPresencePluginFactory::instance(), parent, name ), shuttingDown( false ), resultFormatting( WEB_HTML ) { m_writeScheduler = new TQTimer( this ); diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h index 6580a3c9..8ce3407a 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.h +++ b/kopete/plugins/webpresence/webpresenceplugin.h @@ -63,7 +63,7 @@ private: TQString resultURL; public: - WebPresencePlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + WebPresencePlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~WebPresencePlugin(); virtual void aboutToUnload(); diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp index a727277b..e25458ee 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.cpp +++ b/kopete/plugins/webpresence/webpresencepreferences.cpp @@ -27,8 +27,8 @@ typedef KGenericFactory<WebPresencePreferences> WebPresencePreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_webpresence, WebPresencePreferencesFactory("kcm_kopete_webpresence")) -WebPresencePreferences::WebPresencePreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(WebPresencePreferencesFactory::instance(), tqparent, args) +WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) + : KCModule(WebPresencePreferencesFactory::instance(), parent, args) { // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/plugins/webpresence/webpresencepreferences.h b/kopete/plugins/webpresence/webpresencepreferences.h index f7a9fd19..aac7536a 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.h +++ b/kopete/plugins/webpresence/webpresencepreferences.h @@ -32,7 +32,7 @@ class WebPresencePreferences : public KCModule { TQ_OBJECT public: - WebPresencePreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + WebPresencePreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual void save(); virtual void defaults(); diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 767c7b1a..8575aeed 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -114,8 +114,8 @@ static const char* const servers_ip[] = { #define NUM_SERVERS (sizeof(servers_ip)/sizeof(char*)) - GaduAccount::GaduAccount( Kopete::Protocol* tqparent, const TQString& accountID,const char* name ) -: Kopete::PasswordedAccount( tqparent, accountID, 0, name ) + GaduAccount::GaduAccount( Kopete::Protocol* parent, const TQString& accountID,const char* name ) +: Kopete::PasswordedAccount( parent, accountID, 0, name ) { TQHostAddress ip; p = new GaduAccountPrivate; diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 6cc671b0..99867508 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -43,8 +43,8 @@ #include <tqcombobox.h> #include <krestrictedline.h> -GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* tqparent, const char* name ) -: AddContactPage( tqparent, name ) +GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, const char* name ) +: AddContactPage( parent, name ) { account_ = owner; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/protocols/gadu/gaduaddcontactpage.h b/kopete/protocols/gadu/gaduaddcontactpage.h index 71ab9c6c..1ec333b9 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.h +++ b/kopete/protocols/gadu/gaduaddcontactpage.h @@ -40,7 +40,7 @@ class GaduAddContactPage : public AddContactPage TQ_OBJECT public: - GaduAddContactPage( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); + GaduAddContactPage( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); ~GaduAddContactPage(); virtual bool validateData(); virtual bool apply( Kopete::Account* , Kopete::MetaContact * ); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index e100af2e..8785f08f 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -36,8 +36,8 @@ #include "gaduawayui.h" #include "gaduaway.h" -GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n( "Away Dialog" ), +GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) +: KDialogBase( parent, name, true, i18n( "Away Dialog" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ) { diff --git a/kopete/protocols/gadu/gaduaway.h b/kopete/protocols/gadu/gaduaway.h index 0cf8eef7..6b1e0483 100644 --- a/kopete/protocols/gadu/gaduaway.h +++ b/kopete/protocols/gadu/gaduaway.h @@ -35,7 +35,7 @@ class GaduAway : public KDialogBase TQ_OBJECT public: - GaduAway( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); + GaduAway( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); int status() const; TQString awayText() const; diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 8f45f94c..fb5944f8 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -37,8 +37,8 @@ #include <errno.h> -GaduCommand::GaduCommand( TQObject* tqparent, const char* name ) -: TQObject( tqparent, name ), read_( 0 ), write_( 0 ) +GaduCommand::GaduCommand( TQObject* parent, const char* name ) +: TQObject( parent, name ), read_( 0 ), write_( 0 ) { } @@ -114,13 +114,13 @@ GaduCommand::forwarder() emit socketReady(); } -RegisterCommand::RegisterCommand( TQObject* tqparent, const char* name ) -:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( TQObject* parent, const char* name ) +:GaduCommand( parent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) { } -RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* tqparent, const char* name ) -:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* parent, const char* name ) +:GaduCommand( parent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) { } @@ -293,13 +293,13 @@ void RegisterCommand::watcher() } } -RemindPasswordCommand::RemindPasswordCommand( TQObject* tqparent, const char* name ) -: GaduCommand( tqparent, name ), uin_( 0 ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( TQObject* parent, const char* name ) +: GaduCommand( parent, name ), uin_( 0 ), session_( 0 ) { } -RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* tqparent, const char* name ) -: GaduCommand( tqparent, name ), uin_( uin ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* parent, const char* name ) +: GaduCommand( parent, name ), uin_( uin ), session_( 0 ) { } @@ -351,8 +351,8 @@ RemindPasswordCommand::watcher() enableNotifiers( session_->check ); } -ChangePasswordCommand::ChangePasswordCommand( TQObject* tqparent, const char* name ) -: GaduCommand( tqparent, name ), session_( 0 ) +ChangePasswordCommand::ChangePasswordCommand( TQObject* parent, const char* name ) +: GaduCommand( parent, name ), session_( 0 ) { } diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h index c0576b35..a9c78b35 100644 --- a/kopete/protocols/gadu/gaducommands.h +++ b/kopete/protocols/gadu/gaducommands.h @@ -41,7 +41,7 @@ class GaduCommand : public TQObject TQ_OBJECT public: - GaduCommand( TQObject* tqparent = 0, const char* name = 0 ); + GaduCommand( TQObject* parent = 0, const char* name = 0 ); virtual ~GaduCommand(); virtual void execute() = 0; @@ -77,9 +77,9 @@ class RegisterCommand : public GaduCommand TQ_OBJECT public: - RegisterCommand( TQObject* tqparent = 0, const char* name = 0 ); + RegisterCommand( TQObject* parent = 0, const char* name = 0 ); RegisterCommand( const TQString& email, const TQString& password , - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~RegisterCommand(); void setUserinfo( const TQString& email, const TQString& password, const TQString& token ); @@ -111,8 +111,8 @@ class RemindPasswordCommand : public GaduCommand TQ_OBJECT public: - RemindPasswordCommand( uin_t uin, TQObject* tqparent = 0, const char* name = 0 ); - RemindPasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); + RemindPasswordCommand( uin_t uin, TQObject* parent = 0, const char* name = 0 ); + RemindPasswordCommand( TQObject* parent = 0, const char* name = 0 ); ~RemindPasswordCommand(); void setUIN( uin_t ); @@ -132,7 +132,7 @@ class ChangePasswordCommand : public GaduCommand TQ_OBJECT public: - ChangePasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); + ChangePasswordCommand( TQObject* parent = 0, const char* name = 0 ); ~ChangePasswordCommand(); void setInfo( uin_t uin, const TQString& passwd, const TQString& newpasswd, diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 0b581a42..d7965d3b 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -44,8 +44,8 @@ using Kopete::UserInfoDialog; -GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* tqparent ) -: Kopete::Contact( account, TQString::number( uin ), tqparent ), uin_( uin ) +GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* parent ) +: Kopete::Contact( account, TQString::number( uin ), parent ), uin_( uin ) { msgManager_ = 0L; account_ = static_cast<GaduAccount*>( account ); diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index b44ba883..4235d4e3 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -50,8 +50,8 @@ static TQMutex initmutex; typedef TQMap< unsigned int, GaduAccount* > gaduAccounts; static gaduAccounts accounts; -GaduDCC::GaduDCC( TQObject* tqparent, const char* name ) -:TQObject( tqparent, name ) +GaduDCC::GaduDCC( TQObject* parent, const char* name ) +:TQObject( parent, name ) { } diff --git a/kopete/protocols/gadu/gadudcc.h b/kopete/protocols/gadu/gadudcc.h index 52f07750..465de8d4 100644 --- a/kopete/protocols/gadu/gadudcc.h +++ b/kopete/protocols/gadu/gadudcc.h @@ -37,7 +37,7 @@ class GaduDCC: public TQObject { Q_OBJECT TQ_OBJECT public: - GaduDCC( TQObject* tqparent, const char* name = NULL ); + GaduDCC( TQObject* parent, const char* name = NULL ); ~GaduDCC(); bool unregisterAccount(); bool registerAccount( GaduAccount* ); diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index e95f80d1..2d0e45d4 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -44,8 +44,8 @@ #include "libgadu.h" -GaduDCCTransaction::GaduDCCTransaction( GaduDCC* tqparent, const char* name ) -:TQObject( tqparent, name ), gaduDCC_( tqparent ) +GaduDCCTransaction::GaduDCCTransaction( GaduDCC* parent, const char* name ) +:TQObject( parent, name ), gaduDCC_( parent ) { read_ = NULL; write_ = NULL; diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 244aee2a..08987c16 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -43,8 +43,8 @@ #include "kopetepasswordwidget.h" -GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* tqparent, const char* name ) -: GaduAccountEditUI( tqparent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) +GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* parent, const char* name ) +: GaduAccountEditUI( parent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) { #ifdef __GG_LIBGADU_HAVE_OPENSSL diff --git a/kopete/protocols/gadu/gadueditaccount.h b/kopete/protocols/gadu/gadueditaccount.h index c63ac450..23e230fd 100644 --- a/kopete/protocols/gadu/gadueditaccount.h +++ b/kopete/protocols/gadu/gadueditaccount.h @@ -38,7 +38,7 @@ class GaduEditAccount : public GaduAccountEditUI, public KopeteEditAccountWidget TQ_OBJECT public: - GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* tqparent = 0, const char* name = 0 ); + GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* parent = 0, const char* name = 0 ); virtual bool validateData(); Kopete::Account* apply(); diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index 6c13f1ff..985a9874 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -46,8 +46,8 @@ // FIXME: this and gaduadcontactpage should have one base class, with some code duplicated in both. GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, - TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* parent, const char* name ) +: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( contact ) { @@ -64,8 +64,8 @@ GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, } GaduEditContact::GaduEditContact( GaduAccount* account, GaduContactsList::ContactLine* clin, - TQWidget* tqparent , const char* name ) -: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* parent , const char* name ) +: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( NULL ) { diff --git a/kopete/protocols/gadu/gadueditcontact.h b/kopete/protocols/gadu/gadueditcontact.h index a48bd697..48f95980 100644 --- a/kopete/protocols/gadu/gadueditcontact.h +++ b/kopete/protocols/gadu/gadueditcontact.h @@ -40,9 +40,9 @@ class GaduEditContact : public KDialogBase public: GaduEditContact( GaduAccount*, GaduContact*, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); GaduEditContact( GaduAccount*, GaduContactsList::ContactLine*, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); protected slots: void slotApply(); void listClicked( TQListViewItem* ); diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 8336b6fd..517902f1 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -45,8 +45,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_gadu, KGenericFactory<GaduProtocol>( "kopete_ GaduProtocol* GaduProtocol::protocolStatic_ = 0L; -GaduProtocol::GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& ) -:Kopete::Protocol( GaduProtocolFactory::instance(), tqparent, name ), +GaduProtocol::GaduProtocol( TQObject* parent, const char* name, const TQStringList& ) +:Kopete::Protocol( GaduProtocolFactory::instance(), parent, name ), propFirstName(Kopete::Global::Properties::self()->firstName()), propLastName(Kopete::Global::Properties::self()->lastName()), propEmail(Kopete::Global::Properties::self()->emailAddress()), @@ -99,9 +99,9 @@ GaduProtocol::protocol() } AddContactPage* -GaduProtocol::createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ) +GaduProtocol::createAddContactWidget( TQWidget* parent, Kopete::Account* account ) { - return new GaduAddContactPage( static_cast<GaduAccount*>( account ), tqparent ); + return new GaduAddContactPage( static_cast<GaduAccount*>( account ), parent ); } void @@ -235,9 +235,9 @@ GaduProtocol::createNewAccount( const TQString& accountId ) } KopeteEditAccountWidget* -GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ) +GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* parent ) { - return( new GaduEditAccount( this, account, tqparent ) ); + return( new GaduEditAccount( this, account, parent ) ); } #include "gaduprotocol.moc" diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 99076f9d..5abae065 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -53,16 +53,16 @@ class GaduProtocol : public Kopete::Protocol TQ_OBJECT public: - GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& str); + GaduProtocol( TQObject* parent, const char* name, const TQStringList& str); ~GaduProtocol(); static GaduProtocol *protocol(); // Plugin reimplementation // { - AddContactPage* createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ); + AddContactPage* createAddContactWidget( TQWidget* parent, Kopete::Account* account ); Kopete::Account* createNewAccount( const TQString& accountId ); - KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ); + KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* parent ); bool canSendOffline() const { return true; } virtual Kopete::Contact *deserializeContact( Kopete::MetaContact* metaContact, diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 8c33aef2..570f2796 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -40,8 +40,8 @@ #include <klistview.h> #include <klocale.h> -GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) +: KDialogBase( parent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { mAccount = account; createWidget(); @@ -50,8 +50,8 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* tqparent, const ch show(); } -GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* parent, const char* name ) +: KDialogBase( parent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { ResLine rs; diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h index 78e92e2f..42fed436 100644 --- a/kopete/protocols/gadu/gadupubdir.h +++ b/kopete/protocols/gadu/gadupubdir.h @@ -42,8 +42,8 @@ Q_OBJECT TQ_OBJECT public: - GaduPublicDir( GaduAccount* , TQWidget *tqparent = 0, const char* name = "GaduPublicDir" ); - GaduPublicDir( GaduAccount* , int searchFor, TQWidget* tqparent = 0, const char* name = "GaduPublicDir" ); + GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" ); + GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" ); TQPixmap iconFortqStatus( uint status ); private slots: diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 7baaa1bc..1b24575f 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -35,8 +35,8 @@ #include "gaduregisteraccount.h" #include "gaducommands.h" -GaduRegisterAccount::GaduRegisterAccount( TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) +GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) +: KDialogBase( parent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) { ui = new GaduRegisterAccountUI( this ); setMainWidget( ui ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 6490a1e3..345fdd07 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -38,8 +38,8 @@ #include <string.h> #include <netinet/in.h> -GaduSession::GaduSession( TQObject* tqparent, const char* name ) -: TQObject( tqparent, name ), session_( 0 ), searchSeqNr_( 0 ) +GaduSession::GaduSession( TQObject* parent, const char* name ) +: TQObject( parent, name ), session_( 0 ), searchSeqNr_( 0 ) { textcodec = TQTextCodec::codecForName( "CP1250" ); rtf = new GaduRichTextFormat; diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h index 4487b63a..7f732749 100644 --- a/kopete/protocols/gadu/gadusession.h +++ b/kopete/protocols/gadu/gadusession.h @@ -95,7 +95,7 @@ class GaduSession : public TQObject TQ_OBJECT public: - GaduSession( TQObject* tqparent = 0, const char* name = 0 ); + GaduSession( TQObject* parent = 0, const char* name = 0 ); virtual ~GaduSession(); bool isConnected() const; int status() const; diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index f034cea7..cb9c7928 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -65,8 +65,8 @@ #include "gwaccount.h" -GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name ) -: Kopete::ManagedConnectionAccount ( tqparent, accountID, 0, "groupwiseaccount" ) +GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name ) +: Kopete::ManagedConnectionAccount ( parent, accountID, 0, "groupwiseaccount" ) { Q_UNUSED( name ); // Init the myself contact @@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges() else continue; - GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->tqparent() ); + GWFolder * folder = ::tqqt_cast<GWFolder*>( ( *instIt )->parent() ); if ( folder->id == ( unsigned int )groupId.toInt() ) { found = true; @@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl; //FIXME - get rid of FolderItem & co - fi.parentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id; + fi.parentId = ::tqqt_cast<GWFolder*>( fld->parent() )->id; fi.id = fld->id; fi.name = fld->displayName; } @@ -1227,7 +1227,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact ) for ( ; it != instances.end(); ++it ) { DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); - dit->item( ::tqqt_cast<GWFolder*>( (*it)->tqparent() )->id, (*it)->id ); + dit->item( ::tqqt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id ); TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); } @@ -1499,7 +1499,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->tqparent() ); + GWFolder * folder = ::tqqt_cast<GWFolder *>( ( *candidateInst )->parent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - Looking for a match, MC grp '" << ( *candidateGrp )->displayName() << "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl; @@ -1525,7 +1525,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) candidateGrp = grpIt; ++grpIt; GWContactInstanceList::Iterator instIt = instances.begin(); - GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->tqparent() ); + GWFolder * sourceFolder =::tqqt_cast<GWFolder*>( ( *instIt)->parent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl; // create contactItem parameter @@ -1604,7 +1604,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->tqparent() ); + GWFolder * folder =::tqqt_cast<GWFolder*>( ( *candidateInst )->parent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); @@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) TQValueList< ContactItem > instancesToChange; ContactItem instance; instance.id = (*it)->id; - instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id; + instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->parent() )->id; instance.sequence = (*it)->sequence; instance.dn = contact->dn(); instance.displayName = contact->nickName(); diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index fbb66697..f05f00a1 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -59,7 +59,7 @@ class GroupWiseAccount : public Kopete::ManagedConnectionAccount Q_OBJECT TQ_OBJECT public: - GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name = 0 ); + GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 ); ~GroupWiseAccount(); /** @@ -349,7 +349,7 @@ private: Q_OBJECT TQ_OBJECT public: - OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0); + OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0); signals: void activated( const Kopete::OnlineStatus& status, const TQString & ); private slots: diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index 5bd048cd..e9c04a21 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -25,8 +25,8 @@ #include "gwbytestream.h" #include "gwerror.h" -KNetworkByteStream::KNetworkByteStream ( TQObject *tqparent, const char */*name*/ ) - : ByteStream ( tqparent ) +KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ ) + : ByteStream ( parent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h index 457d9593..1dcbacdc 100644 --- a/kopete/protocols/groupwise/gwbytestream.h +++ b/kopete/protocols/groupwise/gwbytestream.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index b353a6a2..e5daa9d7 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -25,8 +25,8 @@ #include "gwerror.h" #include "gwbytestream.h" -KNetworkConnector::KNetworkConnector ( TQObject *tqparent, const char */*name*/ ) - : Connector ( tqparent ) +KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ ) + : Connector ( parent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl; diff --git a/kopete/protocols/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h index c582fc01..7f3ef3ac 100644 --- a/kopete/protocols/groupwise/gwconnector.h +++ b/kopete/protocols/groupwise/gwconnector.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkConnector ( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkConnector ( TQObject *parent = 0, const char *name = 0 ); virtual ~KNetworkConnector (); diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 06ac510f..11f2d23b 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -47,9 +47,9 @@ using namespace GroupWise; GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, - Kopete::MetaContact *tqparent, + Kopete::MetaContact *parent, const int objectId, const int parentId, const int sequence ) -: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ), +: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), parent ), m_objectId( objectId ), m_parentId( parentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { if ( dn.find( '=' ) != -1 ) @@ -58,7 +58,7 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn } connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); - setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); + setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); } GroupWiseContact::~GroupWiseContact() diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index d3c98a6b..2e81823f 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -59,13 +59,13 @@ public: * Constructor * @param account The GroupWiseAccount this belongs to. * @param uniqueName The userId for this contact. May be a DN, in which case it will be converted to dotted format for the contactId and stored. - * @param tqparent The Kopete::MetaContact this contact is part of. + * @param parent The Kopete::MetaContact this contact is part of. * @param objectId The contact's numeric object ID. - * @param parentId The ID of this contact's tqparent (folder). - * @param sequence This contact's sequence number (The position it appears in within its tqparent). + * @param parentId The ID of this contact's parent (folder). + * @param sequence This contact's sequence number (The position it appears in within its parent). */ GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, - Kopete::MetaContact *tqparent, + Kopete::MetaContact *parent, const int objectId, const int parentId, const int sequence ); ~GroupWiseContact(); diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index 306a457c..ecca8912 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -22,8 +22,8 @@ #include "gwcontactlist.h" #include "gwerror.h" //debug area -GWContactList::GWContactList( TQObject * tqparent ) - : TQObject( tqparent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) ) +GWContactList::GWContactList( TQObject * parent ) + : TQObject( parent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) ) { } GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ) @@ -34,7 +34,7 @@ GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, con return 0; } -GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ) +GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ) { TQObjectList * l = queryList( "GWFolder", 0, false, true ); TQObjectListIt it( *l ); // iterate over the buttons @@ -43,7 +43,7 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned while ( (obj = it.current()) != 0 ) { GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); - if ( folder && folder->id == tqparent ) + if ( folder && folder->id == parent ) { contact = new GWContactInstance( folder, id, sequence, displayName, dn ); break; @@ -187,12 +187,12 @@ void GWContactList::clear() } } -GWContactListItem::GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - TQObject( tqparent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) +GWContactListItem::GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + TQObject( parent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) { } -GWFolder::GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - GWContactListItem( tqparent, theId, theSequence, theDisplayName ) +GWFolder::GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + GWContactListItem( parent, theId, theSequence, theDisplayName ) { } void GWFolder::dump( unsigned int depth ) @@ -223,8 +223,8 @@ void GWFolder::dump( unsigned int depth ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s << " no contacts." << endl; } -GWContactInstance::GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : - GWContactListItem( tqparent, theId, theSequence, theDisplayName ), dn( theDn ) +GWContactInstance::GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : + GWContactListItem( parent, theId, theSequence, theDisplayName ), dn( theDn ) { } void GWContactInstance::dump( unsigned int depth ) diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h index e6f2dcac..b70de5af 100644 --- a/kopete/protocols/groupwise/gwcontactlist.h +++ b/kopete/protocols/groupwise/gwcontactlist.h @@ -44,9 +44,9 @@ class GWContactList : public TQObject Q_OBJECT TQ_OBJECT public: - GWContactList( TQObject * tqparent ); + GWContactList( TQObject * parent ); GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ); - GWContactInstance * addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ); + GWContactInstance * addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ); GWFolder * findFolderById( unsigned int id ); GWFolder * findFolderByName( const TQString & name ); GWContactInstanceList instancesWithDn( const TQString & dn ); @@ -63,7 +63,7 @@ class GWContactListItem : public TQObject Q_OBJECT TQ_OBJECT public: - GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); unsigned int id; // OBJECT_ID unsigned int sequence; // SEQUENCE_NUMBER @@ -75,7 +75,7 @@ class GWFolder : public GWContactListItem Q_OBJECT TQ_OBJECT public: - GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); virtual void dump( unsigned int depth ); }; @@ -84,7 +84,7 @@ class GWContactInstance : public GWContactListItem Q_OBJECT TQ_OBJECT public: - GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); + GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); TQString dn; // DN virtual void dump( unsigned int depth ); }; diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 0a9e09ee..4e139ce0 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_groupwise, GroupWiseProtocolFactory( "kopete_ GroupWiseProtocol *GroupWiseProtocol::s_protocol = 0L; -GroupWiseProtocol::GroupWiseProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( GroupWiseProtocolFactory::instance(), tqparent, name ), +GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( GroupWiseProtocolFactory::instance(), parent, name ), /* initialise Kopete::OnlineStatus that should be user selectable in the user interface */ groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString(), i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ), @@ -110,16 +110,16 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); } -AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) +AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * account ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Creating Add Contact Page" << endl; - return new GroupWiseAddContactPage( account, tqparent, "addcontactpage"); + return new GroupWiseAddContactPage( account, parent, "addcontactpage"); } -KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) +KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << "Creating Edit Account Page" << endl; - return new GroupWiseEditAccountWidget( tqparent, account ); + return new GroupWiseEditAccountWidget( parent, account ); } Kopete::Account *GroupWiseProtocol::createNewAccount( const TQString &accountId ) diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h index 001d6f96..95105f17 100644 --- a/kopete/protocols/groupwise/gwprotocol.h +++ b/kopete/protocols/groupwise/gwprotocol.h @@ -36,7 +36,7 @@ class GroupWiseProtocol : public Kopete::Protocol Q_OBJECT TQ_OBJECT public: - GroupWiseProtocol(TQObject *tqparent, const char *name, const TQStringList &args); + GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args); ~GroupWiseProtocol(); /** * Convert the serialised data back into a GroupWiseContact and add this @@ -50,11 +50,11 @@ public: /** * Generate the widget needed to add GroupWiseContacts */ - virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account ); /** * Generate the widget needed to add/edit accounts for this protocol */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); /** * Generate a GroupWiseAccount */ diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp index 35ef278e..0b20c050 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { d = new Private; } diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h index 5706fff6..b72fad78 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.h +++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index d285b8af..3ee9b947 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -28,8 +28,8 @@ #include "chatroommanager.h" -ChatroomManager::ChatroomManager( Client * tqparent, const char *name) - : TQObject(tqparent, name), m_client( tqparent ), m_replace( false ) +ChatroomManager::ChatroomManager( Client * parent, const char *name) + : TQObject(parent, name), m_client( parent ), m_replace( false ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h index 9d559bf3..8bdd236d 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.h +++ b/kopete/protocols/groupwise/libgroupwise/client.h @@ -47,7 +47,7 @@ Q_OBJECT EXTERNAL API *************/ - Client( TQObject *tqparent = 0, uint protocolVersion = 2 ); + Client( TQObject *parent = 0, uint protocolVersion = 2 ); ~Client(); void setOSName( const TQString &name ); void setClientName( const TQString &s ); diff --git a/kopete/protocols/groupwise/libgroupwise/connector.cpp b/kopete/protocols/groupwise/libgroupwise/connector.cpp index 3b702d7a..849569a0 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.cpp +++ b/kopete/protocols/groupwise/libgroupwise/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setUseSSL(false); setPeerAddressNone(); diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h index d09d0a7f..7654f7f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.h +++ b/kopete/protocols/groupwise/libgroupwise/connector.h @@ -31,7 +31,7 @@ class Connector : public TQObject Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index d779564a..b6ff646d 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -25,8 +25,8 @@ using namespace GroupWise; -EventProtocol::EventProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +EventProtocol::EventProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index 65c0672b..97e48c22 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -111,7 +111,7 @@ class EventProtocol : public InputProtocolBase Q_OBJECT TQ_OBJECT public: - EventProtocol(TQObject *tqparent = 0, const char *name = 0); + EventProtocol(TQObject *parent = 0, const char *name = 0); ~EventProtocol(); /** * Attempt to parse the supplied data into an @ref EventTransfer object. diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index b55ba48e..594d0d16 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h @@ -58,7 +58,7 @@ public: EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); ~EventTransfer(); /** - * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it contains + * Access the bitmask that describes the transfer's contents. Use @ref Contents to determine what it contains */ TQ_UINT32 contents(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 8b5f9708..7305f7bc 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -143,8 +143,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) +:Stream(parent) { d = new Private; d->mode = Client; diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h index 749eeaa7..8e2394c3 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h @@ -87,7 +87,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); ~ClientStream(); void connectToServer(const NovellDN &id, bool auth=true); diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 0a7d7d8d..14a5af70 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -23,8 +23,8 @@ #include "gwfield.h" #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) + : TQObject(parent, name) { } diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h index 2f2f9f1e..152ac0f1 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); + InputProtocolBase(TQObject *parent = 0, const char *name = 0); ~InputProtocolBase(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp index f00eee70..9aa7d80b 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp @@ -864,8 +864,8 @@ public: TQPtrList<QCA_CertContext> store; }; -TLS::TLS(TQObject *tqparent) -:TQObject(tqparent) +TLS::TLS(TQObject *parent) +:TQObject(parent) { d = new Private; } @@ -1132,8 +1132,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *tqparent) -:TQObject(tqparent) +SASL::SASL(TQObject *parent) +:TQObject(parent) { d = new Private; reset(); diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h index dab99d5a..79b028bf 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h @@ -333,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *tqparent=0); + TLS(TQObject *parent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -392,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *tqparent=0); + SASL(TQObject *parent=0); ~SASL(); static void setAppName(const TQString &name); diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp index 1213b6dc..0cf55684 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp @@ -30,11 +30,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) -:TLSHandler(tqparent) +QCATLSHandler::QCATLSHandler(QCA::TLS *parent) +:TLSHandler(parent) { d = new Private; - d->tls = tqparent; + d->tls = parent; connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h index 3a2ee71e..65c89f55 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h @@ -30,7 +30,7 @@ class QCATLSHandler : public TLSHandler Q_OBJECT TQ_OBJECT public: - QCATLSHandler(QCA::TLS *tqparent); + QCATLSHandler(QCA::TLS *parent); ~QCATLSHandler(); QCA::TLS *tls() const; diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index c455eaec..50788178 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -22,7 +22,7 @@ #include "responseprotocol.h" -ResponseProtocol::ResponseProtocol(TQObject* tqparent, const char* name): InputProtocolBase(tqparent, name) +ResponseProtocol::ResponseProtocol(TQObject* parent, const char* name): InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h index 9010ef3c..1a9c1b94 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h @@ -44,7 +44,7 @@ public: */ enum PacketState { FieldsRead, ProtocolError }; - ResponseProtocol(TQObject* tqparent, const char* name); + ResponseProtocol(TQObject* parent, const char* name); ~ResponseProtocol(); /** * Attempt to parse the supplied data into an @ref Response object. diff --git a/kopete/protocols/groupwise/libgroupwise/stream.cpp b/kopete/protocols/groupwise/libgroupwise/stream.cpp index 87da3baa..d3410578 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h index 15544a6c..e07b5e49 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.h +++ b/kopete/protocols/groupwise/libgroupwise/stream.h @@ -46,7 +46,7 @@ public: SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 142db094..858c8fde 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -41,22 +41,22 @@ public: Transfer * transfer; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); d->transfer = 0; - d->client = tqparent->client(); + d->client = parent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *tqparent, bool) +Task::Task(Client *parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -77,9 +77,9 @@ void Task::init() d->statusCode = 0; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Client *Task::client() const diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h index 8d2bc380..223e7243 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.h +++ b/kopete/protocols/groupwise/libgroupwise/task.h @@ -35,11 +35,11 @@ class Task : public TQObject TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task( Client *, bool isRoot ); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Client *client() const; Transfer *transfer() const; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp index fa28ece0..fb028c44 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp @@ -26,7 +26,7 @@ using namespace GroupWise; -ChatCountsTask::ChatCountsTask(Task* tqparent): RequestTask(tqparent) +ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent) { Field::FieldList lst; createTransfer( "chatcounts", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h index 9a052dac..65edb07e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h @@ -36,7 +36,7 @@ class ChatCountsTask : public RequestTask Q_OBJECT TQ_OBJECT public: - ChatCountsTask(Task* tqparent); + ChatCountsTask(Task* parent); ~ChatCountsTask(); bool take( Transfer * transfer ); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp index fe8cf20c..4dceacc1 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp @@ -25,7 +25,7 @@ using namespace GroupWise; -ChatPropertiesTask::ChatPropertiesTask(Task* tqparent): RequestTask(tqparent) +ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h index dfb73139..e8b05c99 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h @@ -37,7 +37,7 @@ class ChatPropertiesTask : public RequestTask Q_OBJECT TQ_OBJECT public: - ChatPropertiesTask(Task* tqparent); + ChatPropertiesTask(Task* parent); ~ChatPropertiesTask(); /** * Specify which chatroom to get properties for diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index de78465f..3fccc218 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -23,8 +23,8 @@ #include "conferencetask.h" -ConferenceTask::ConferenceTask( Task* tqparent ) - : EventTask( tqparent ) +ConferenceTask::ConferenceTask( Task* parent ) + : EventTask( parent ) { // register all the events that this task monitors registerEvent( GroupWise::ConferenceClosed ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h index 4a1f6d19..64b9f111 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h @@ -38,7 +38,7 @@ class ConferenceTask : public EventTask Q_OBJECT TQ_OBJECT public: - ConferenceTask( Task* tqparent ); + ConferenceTask( Task* parent ); ~ConferenceTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp index 3778e80a..3d041208 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp @@ -21,7 +21,7 @@ #include "connectiontask.h" -ConnectionTask::ConnectionTask(Task* tqparent): EventTask(tqparent) +ConnectionTask::ConnectionTask(Task* parent): EventTask(parent) { registerEvent( GroupWise::UserDisconnect ); registerEvent( GroupWise::ServerDisconnect ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h index da7507b1..0bbc2625 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h @@ -33,7 +33,7 @@ class ConnectionTask : public EventTask Q_OBJECT TQ_OBJECT public: - ConnectionTask(Task* tqparent); + ConnectionTask(Task* parent); ~ConnectionTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp index e87ee0f4..01d2fa05 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp @@ -24,7 +24,7 @@ #include "createconferencetask.h" -CreateConferenceTask::CreateConferenceTask(Task* tqparent): RequestTask(tqparent), m_confId( 0 ), m_guid( BLANK_GUID ) +CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h index c43e5725..69911dac 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h @@ -33,7 +33,7 @@ class CreateConferenceTask : public RequestTask Q_OBJECT TQ_OBJECT public: - CreateConferenceTask(Task* tqparent); + CreateConferenceTask(Task* parent); ~CreateConferenceTask(); /** * Set up a create conference request diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index 6f410dcb..d41db4a9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -21,7 +21,7 @@ #include "createcontactinstancetask.h" -CreateContactInstanceTask::CreateContactInstanceTask(Task* tqparent) : NeedFolderTask(tqparent) +CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h index 19e41f2e..fc7bb184 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h @@ -24,7 +24,7 @@ #include "needfoldertask.h" /** -Creates a contact on the server. The response to this action is handled by its tqparent +Creates a contact on the server. The response to this action is handled by its parent @author SUSE AG */ @@ -33,7 +33,7 @@ class CreateContactInstanceTask : public NeedFolderTask Q_OBJECT TQ_OBJECT public: - CreateContactInstanceTask(Task* tqparent); + CreateContactInstanceTask(Task* parent); ~CreateContactInstanceTask(); /** * Sets up the request message. diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index bf0873ab..920eec3b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -24,7 +24,7 @@ #include "createcontacttask.h" -CreateContactTask::CreateContactTask(Task* tqparent): Task(tqparent) +CreateContactTask::CreateContactTask(Task* parent): Task(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h index 1ca6f141..f63a19af 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h @@ -44,7 +44,7 @@ class CreateContactTask : public Task Q_OBJECT TQ_OBJECT public: - CreateContactTask(Task* tqparent); + CreateContactTask(Task* parent); ~CreateContactTask(); /** * Get the userId of the contact just created diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp index a165cdc2..c6e6a78a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp @@ -20,7 +20,7 @@ #include "createfoldertask.h" -CreateFolderTask::CreateFolderTask(Task* tqparent): ModifyContactListTask(tqparent) +CreateFolderTask::CreateFolderTask(Task* parent): ModifyContactListTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h index 448e17a2..37dbc19f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h @@ -33,7 +33,7 @@ class CreateFolderTask : public ModifyContactListTask Q_OBJECT TQ_OBJECT public: - CreateFolderTask(Task* tqparent); + CreateFolderTask(Task* parent); ~CreateFolderTask(); void folder( const int parentId, const int sequence, const TQString & displayName ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp index ad67cb4c..04ce1fb4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp @@ -20,7 +20,7 @@ #include "deleteitemtask.h" -DeleteItemTask::DeleteItemTask(Task* tqparent): ModifyContactListTask(tqparent) +DeleteItemTask::DeleteItemTask(Task* parent): ModifyContactListTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h index 2e2ed64c..ce2e3bd0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h @@ -31,7 +31,7 @@ class DeleteItemTask : public ModifyContactListTask Q_OBJECT TQ_OBJECT public: - DeleteItemTask(Task* tqparent); + DeleteItemTask(Task* parent); ~DeleteItemTask(); void item( const int parentFolder, const int objectId ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp index 6d252a4d..c6bd2d85 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp @@ -21,8 +21,8 @@ #include "gwfield.h" #include "eventtask.h" -EventTask::EventTask( Task * tqparent ) -: Task( tqparent ) +EventTask::EventTask( Task * parent ) +: Task( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h index 5de20281..15ed1761 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h @@ -33,7 +33,7 @@ class EventTask : public Task Q_OBJECT TQ_OBJECT public: - EventTask( Task *tqparent ); + EventTask( Task *parent ); protected: bool forMe( Transfer * transfer, EventTransfer *& event ) const; void registerEvent( GroupWise::Event e ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 1c8e1d39..7744552c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -29,7 +29,7 @@ using namespace GroupWise; -GetChatSearchResultsTask::GetChatSearchResultsTask(Task* tqparent): RequestTask(tqparent) +GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h index dcafb3e7..bebe8ff7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h @@ -38,7 +38,7 @@ class GetChatSearchResultsTask : public RequestTask TQ_OBJECT public: enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 }; - GetChatSearchResultsTask(Task* tqparent); + GetChatSearchResultsTask(Task* parent); ~GetChatSearchResultsTask(); void poll( int queryHandle); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp index 5f2cbe18..61753d84 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp @@ -26,8 +26,8 @@ using namespace GroupWise; -GetDetailsTask::GetDetailsTask( Task * tqparent ) - : RequestTask( tqparent ) +GetDetailsTask::GetDetailsTask( Task * parent ) + : RequestTask( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h index c45ad0e9..577ccc45 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h @@ -36,7 +36,7 @@ class GetDetailsTask : public RequestTask Q_OBJECT TQ_OBJECT public: - GetDetailsTask( Task * tqparent ); + GetDetailsTask( Task * parent ); ~GetDetailsTask(); bool take( Transfer * transfer ); void userDNs( const TQStringList & userDNs ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp index 68063261..86179b62 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp @@ -22,7 +22,7 @@ #include "getstatustask.h" -GetStatusTask::GetStatusTask(Task* tqparent): RequestTask(tqparent) +GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h index 9188fdd4..bd291c62 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h @@ -32,7 +32,7 @@ class GetStatusTask : public RequestTask Q_OBJECT TQ_OBJECT public: - GetStatusTask(Task* tqparent); + GetStatusTask(Task* parent); ~GetStatusTask(); void userDN( const TQString & dn ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp index d8a4c709..a14d6eec 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp @@ -25,7 +25,7 @@ #include "joinchattask.h" -JoinChatTask::JoinChatTask(Task* tqparent): RequestTask(tqparent) +JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h index 654d1a64..36b14d28 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h @@ -36,7 +36,7 @@ class JoinChatTask : public RequestTask Q_OBJECT TQ_OBJECT public: - JoinChatTask(Task* tqparent); + JoinChatTask(Task* parent); ~JoinChatTask(); void join( const TQString & displayName ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index 9ab94d0d..ed4f6bfd 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -25,7 +25,7 @@ #include "joinconferencetask.h" -JoinConferenceTask::JoinConferenceTask(Task* tqparent): RequestTask(tqparent) +JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h index 29f34679..0f92379f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h @@ -36,7 +36,7 @@ class JoinConferenceTask : public RequestTask Q_OBJECT TQ_OBJECT public: - JoinConferenceTask(Task* tqparent); + JoinConferenceTask(Task* parent); ~JoinConferenceTask(); void join( const ConferenceGuid & guid ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp index d3c75055..ac84ac2b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp @@ -24,7 +24,7 @@ #include "requestfactory.h" #include "keepalivetask.h" -KeepAliveTask::KeepAliveTask(Task* tqparent): RequestTask(tqparent) +KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h index dffe1059..b9d9272c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h @@ -31,7 +31,7 @@ class KeepAliveTask : public RequestTask Q_OBJECT TQ_OBJECT public: - KeepAliveTask(Task* tqparent); + KeepAliveTask(Task* parent); ~KeepAliveTask(); void setup(); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp index 516c74c3..d2d58b83 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp @@ -20,7 +20,7 @@ #include "leaveconferencetask.h" -LeaveConferenceTask::LeaveConferenceTask(Task* tqparent): RequestTask(tqparent) +LeaveConferenceTask::LeaveConferenceTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h index 72262b9e..30d9e293 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h @@ -33,7 +33,7 @@ class LeaveConferenceTask : public RequestTask Q_OBJECT TQ_OBJECT public: - LeaveConferenceTask(Task* tqparent); + LeaveConferenceTask(Task* parent); ~LeaveConferenceTask(); void leave( const GroupWise::ConferenceGuid & guid ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index a3a0f556..f3d55583 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -25,8 +25,8 @@ #include "logintask.h" -LoginTask::LoginTask( Task * tqparent ) - : RequestTask( tqparent ) +LoginTask::LoginTask( Task * parent ) + : RequestTask( parent ) { } @@ -67,7 +67,7 @@ bool LoginTask::take( Transfer * transfer ) ContactDetails cd = extractUserDetails( loginResponseFields ); emit gotMyself( cd ); - // read the privacy settings first, because this affects all contacts' aptqparent status + // read the privacy settings first, because this affects all contacts' apparent status extractPrivacy( loginResponseFields ); extractCustomStatuses( loginResponseFields ); @@ -119,11 +119,11 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // tqparent + // parent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); folder.parentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } @@ -135,7 +135,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer ) ContactItem contact; Field::SingleField * current; Field::FieldList fl = contactContainer->fields(); - // sequence number, object and tqparent IDs are a numeric values but are stored as strings... + // sequence number, object and parent IDs are a numeric values but are stored as strings... current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h index b099be6a..f37add97 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h @@ -33,7 +33,7 @@ class LoginTask : public RequestTask Q_OBJECT TQ_OBJECT public: - LoginTask( Task * tqparent ); + LoginTask( Task * parent ); ~LoginTask(); /** * Get the login fields ready to go diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp index be04efad..10233a18 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp @@ -23,7 +23,7 @@ #include "gwerror.h" #include "modifycontactlisttask.h" -ModifyContactListTask::ModifyContactListTask(Task* tqparent): RequestTask(tqparent) +ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent) { } @@ -125,7 +125,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // tqparent + // parent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); folder.parentId = current->value().toInt(); if ( container->method() == NMFIELD_METHOD_ADD ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h index 62d02bfa..b0787ce0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h @@ -24,7 +24,7 @@ #include "requesttask.h" /** -This is the tqparent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. +This is the parent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. @author SUSE AG */ @@ -36,7 +36,7 @@ class ModifyContactListTask : public RequestTask Q_OBJECT TQ_OBJECT public: - ModifyContactListTask(Task* tqparent); + ModifyContactListTask(Task* parent); ~ModifyContactListTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index c9d6aac9..4a24f44f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -22,7 +22,7 @@ #include "movecontacttask.h" -MoveContactTask::MoveContactTask(Task* tqparent): NeedFolderTask(tqparent) +MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h index adeeb68d..b67a23ac 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h @@ -33,7 +33,7 @@ class MoveContactTask : public NeedFolderTask Q_OBJECT TQ_OBJECT public: - MoveContactTask(Task* tqparent); + MoveContactTask(Task* parent); ~MoveContactTask(); void moveContact( const ContactItem & contact, const int newParent ); void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const TQString & folderDisplayName ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 842ef31c..5a1eb414 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -15,7 +15,7 @@ #include "needfoldertask.h" -NeedFolderTask::NeedFolderTask(Task* tqparent): ModifyContactListTask(tqparent) +NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h index 167197e0..383be314 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h @@ -24,7 +24,7 @@ class NeedFolderTask : public ModifyContactListTask Q_OBJECT TQ_OBJECT public: - NeedFolderTask(Task* tqparent); + NeedFolderTask(Task* parent); ~NeedFolderTask(); void createFolder(); virtual void onFolderCreated() = 0; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index 3fadb5a5..38870112 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -27,7 +27,7 @@ using namespace GroupWise; -PollSearchResultsTask::PollSearchResultsTask(Task* tqparent): RequestTask(tqparent) +PollSearchResultsTask::PollSearchResultsTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h index a882a9b3..ccf0560b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 }; - PollSearchResultsTask(Task* tqparent); + PollSearchResultsTask(Task* parent); ~PollSearchResultsTask(); void poll( const TQString & queryHandle); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp index 2c9ac7ef..508b3306 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp @@ -20,7 +20,7 @@ #include "privacyitemtask.h" -PrivacyItemTask::PrivacyItemTask( Task* tqparent) : RequestTask( tqparent ) +PrivacyItemTask::PrivacyItemTask( Task* parent) : RequestTask( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h index de894186..ea0d5e42 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h @@ -33,7 +33,7 @@ class PrivacyItemTask : public RequestTask Q_OBJECT TQ_OBJECT public: - PrivacyItemTask( Task* tqparent); + PrivacyItemTask( Task* parent); ~PrivacyItemTask(); void allow( const TQString & dn ); void deny( const TQString & dn ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp index 9a3f8780..2b252ff5 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp @@ -20,7 +20,7 @@ #include "rejectinvitetask.h" -RejectInviteTask::RejectInviteTask(Task* tqparent): RequestTask(tqparent) +RejectInviteTask::RejectInviteTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h index b7ee62f0..b4903596 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h @@ -33,7 +33,7 @@ class RejectInviteTask : public RequestTask Q_OBJECT TQ_OBJECT public: - RejectInviteTask(Task* tqparent); + RejectInviteTask(Task* parent); ~RejectInviteTask(); void reject( const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp index 12645297..7d4b41aa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp @@ -26,8 +26,8 @@ #include "requesttask.h" -RequestTask::RequestTask( Task * tqparent ) -: Task( tqparent ) +RequestTask::RequestTask( Task * parent ) +: Task( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h index e12bd741..10f6568c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h @@ -30,7 +30,7 @@ class RequestTask : public Task Q_OBJECT TQ_OBJECT public: - RequestTask( Task *tqparent ); + RequestTask( Task *parent ); bool take( Transfer * transfer ); virtual void onGo(); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index e0e56634..946450e9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -40,7 +40,7 @@ using namespace GroupWise; -SearchChatTask::SearchChatTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) +SearchChatTask::SearchChatTask(Task* parent): RequestTask(parent), m_polls( 0 ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h index 4d010ffe..aa87e474 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h @@ -39,7 +39,7 @@ class SearchChatTask : public RequestTask public: enum SearchType { FetchAll=0, SinceLastSearch }; - SearchChatTask(Task* tqparent); + SearchChatTask(Task* parent); ~SearchChatTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 2d0522c3..3dde5297 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -39,7 +39,7 @@ using namespace GroupWise; -SearchUserTask::SearchUserTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) +SearchUserTask::SearchUserTask(Task* parent): RequestTask(parent), m_polls( 0 ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h index 5e79ac2f..1fa398d6 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h @@ -35,7 +35,7 @@ class SearchUserTask : public RequestTask Q_OBJECT TQ_OBJECT public: - SearchUserTask(Task* tqparent); + SearchUserTask(Task* parent); ~SearchUserTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp index 60d9f986..9fa7d65e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp @@ -20,7 +20,7 @@ #include "sendinvitetask.h" -SendInviteTask::SendInviteTask(Task* tqparent): RequestTask(tqparent) +SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h index 70672e3e..b08c7259 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h @@ -33,7 +33,7 @@ This sends an invitation to a conference class SendInviteTask : public RequestTask { public: - SendInviteTask(Task* tqparent); + SendInviteTask(Task* parent); ~SendInviteTask(); void invite( const GroupWise::ConferenceGuid & guid, const TQStringList & invitees, const GroupWise::OutgoingMessage & msg ); private: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp index 13e65435..fdf1173f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp @@ -20,7 +20,7 @@ #include "sendmessagetask.h" -SendMessageTask::SendMessageTask(Task* tqparent): RequestTask(tqparent) +SendMessageTask::SendMessageTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h index 95175d77..44559e15 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h @@ -32,7 +32,7 @@ Sends messages to a particular conference on the server class SendMessageTask : public RequestTask { public: - SendMessageTask(Task* tqparent); + SendMessageTask(Task* parent); ~SendMessageTask(); void message( const TQStringList & recipientDNList, const OutgoingMessage & msg ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp index 696ffffa..6feecc88 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp @@ -22,7 +22,7 @@ using namespace GroupWise; -SetStatusTask::SetStatusTask(Task* tqparent): RequestTask(tqparent) +SetStatusTask::SetStatusTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h index 72eaf9a4..0c316220 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h @@ -32,7 +32,7 @@ class SetStatusTask : public RequestTask Q_OBJECT TQ_OBJECT public: - SetStatusTask(Task* tqparent); + SetStatusTask(Task* parent); ~SetStatusTask(); void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ); GroupWise::tqStatus requestedtqStatus() const; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp index fa360a45..7076324a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -22,7 +22,7 @@ #include "statustask.h" -StatusTask::StatusTask(Task* tqparent): EventTask(tqparent) +StatusTask::StatusTask(Task* parent): EventTask(parent) { registerEvent( GroupWise::StatusChange ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h index 90d46bc7..de5839d7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h @@ -31,7 +31,7 @@ class StatusTask : public EventTask Q_OBJECT TQ_OBJECT public: - StatusTask(Task* tqparent); + StatusTask(Task* parent); ~StatusTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp index f9136eca..2a421752 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp @@ -22,7 +22,7 @@ #include "typingtask.h" -TypingTask::TypingTask(Task* tqparent): RequestTask(tqparent) +TypingTask::TypingTask(Task* parent): RequestTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h index 84fe6e46..7fc63f90 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - TypingTask(Task* tqparent); + TypingTask(Task* parent); ~TypingTask(); void typing( const GroupWise::ConferenceGuid & guid, const bool typing ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp index a1e539d9..aa75441d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp @@ -24,7 +24,7 @@ using namespace GroupWise; -UpdateContactTask::UpdateContactTask(Task* tqparent): UpdateItemTask(tqparent) +UpdateContactTask::UpdateContactTask(Task* parent): UpdateItemTask(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h index 5ced02a5..17dad6e7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h @@ -34,7 +34,7 @@ class UpdateContactTask : public UpdateItemTask Q_OBJECT TQ_OBJECT public: - UpdateContactTask(Task* tqparent); + UpdateContactTask(Task* parent); ~UpdateContactTask(); void renameContact( const TQString& newName, const TQValueList<GroupWise::ContactItem> & contactInstances ); TQString displayName(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp index af0785de..3f8ff7bf 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp @@ -21,7 +21,7 @@ #include "updatefoldertask.h" -UpdateFolderTask::UpdateFolderTask(Task* tqparent): UpdateItemTask(tqparent) +UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent) { } @@ -39,7 +39,7 @@ void UpdateFolderTask::renameFolder( const TQString & newName, const GroupWise:: renamed.name = newName; // add the new version of the folder, marked add lst.append( new Field::MultiField( NM_A_FA_FOLDER, NMFIELD_METHOD_ADD, 0, NMFIELD_TYPE_ARRAY, folderToFields( renamed ) ) ); - // let our tqparent class package it up as a contactlist in a transfer + // let our parent class package it up as a contactlist in a transfer UpdateItemTask::item( lst ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h index 90882a3d..1f3dcd07 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h @@ -33,7 +33,7 @@ class UpdateFolderTask : public UpdateItemTask Q_OBJECT TQ_OBJECT public: - UpdateFolderTask(Task* tqparent); + UpdateFolderTask(Task* parent); ~UpdateFolderTask(); void renameFolder( const TQString & newName, const GroupWise::FolderItem & existing ); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp index 95edb593..1af4ef12 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp @@ -20,7 +20,7 @@ #include "updateitemtask.h" -UpdateItemTask::UpdateItemTask( Task* tqparent) : RequestTask( tqparent ) +UpdateItemTask::UpdateItemTask( Task* parent) : RequestTask( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h index a988e371..4e0bea2d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h @@ -33,7 +33,7 @@ class UpdateItemTask : public RequestTask Q_OBJECT TQ_OBJECT public: - UpdateItemTask( Task* tqparent ); + UpdateItemTask( Task* parent ); ~UpdateItemTask(); void item( Field::FieldList updateItemFields ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp index 21010e57..16527bba 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp @@ -19,8 +19,8 @@ #include "tlshandler.h" -TLSHandler::TLSHandler(TQObject *tqparent) -:TQObject(tqparent) +TLSHandler::TLSHandler(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h index 67c47409..8a964101 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h @@ -33,7 +33,7 @@ class TLSHandler : public TQObject Q_OBJECT TQ_OBJECT public: - TLSHandler(TQObject *tqparent=0); + TLSHandler(TQObject *parent=0); virtual ~TLSHandler(); virtual void reset()=0; diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index c10fda5c..f87cfa25 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -20,8 +20,8 @@ #include "userdetailsmanager.h" -UserDetailsManager::UserDetailsManager( Client * tqparent, const char *name) - : TQObject(tqparent, name), m_client( tqparent ) +UserDetailsManager::UserDetailsManager( Client * parent, const char *name) + : TQObject(parent, name), m_client( parent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h index e7ba7ac4..4f4c8df9 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h @@ -36,7 +36,7 @@ class UserDetailsManager : public TQObject Q_OBJECT TQ_OBJECT public: - UserDetailsManager( Client * tqparent, const char *name = 0); + UserDetailsManager( Client * parent, const char *name = 0); ~UserDetailsManager(); /** * List of DNs that we have already received details for diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index ad0c75be..5ece3882 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -45,8 +45,8 @@ #include "gwaddui.h" #include "userdetailsmanager.h" -GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent, const char* name ) - : AddContactPage(tqparent, name) +GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent, const char* name ) + : AddContactPage(parent, name) { m_account = static_cast<GroupWiseAccount *>( owner ); kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h index 10a36e21..8597a7ec 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h @@ -43,7 +43,7 @@ class GroupWiseAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent = 0, const char* name = 0 ); + GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 ); ~GroupWiseAddContactPage(); /** diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 41b26f66..1cfee7ee 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -29,16 +29,16 @@ #include "gwchatpropsdialog.h" -GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ) - : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), +GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * parent, const char * name ) + : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); } GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * tqparent, const char * name ) - : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), + TQWidget * parent, const char * name ) + : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h index d7ba18c3..b3ecc6f3 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h @@ -46,12 +46,12 @@ class GroupWiseChatPropsDialog : public KDialogBase /** * Construct an empty dialog */ - GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ); + GroupWiseChatPropsDialog( TQWidget * parent, const char * name ); /** * Construct a populated dialog */ GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * tqparent, const char * name ); + TQWidget * parent, const char * name ); ~GroupWiseChatPropsDialog() {} diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index 5c55310d..b9021b1f 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -34,8 +34,8 @@ #include "gwchatsearchdialog.h" -GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, false, i18n( "Search Chatrooms" ), +GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n( "Search Chatrooms" ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ) { m_widget = new GroupWiseChatSearchWidget( this ); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h index e22860d3..a063284a 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h @@ -31,7 +31,7 @@ class GroupWiseChatSearchDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); + GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); ~GroupWiseChatSearchDialog(); protected: void populateWidget(); diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 7c7042dd..e7b6ecb2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -41,8 +41,8 @@ #include "gwcontactproperties.h" -GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name) - : TQObject(tqparent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name) + : TQObject(parent, name) { init(); // set up the contents of the props widget @@ -56,8 +56,8 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta m_dialog->show(); } -GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *tqparent, const char *name ) - : TQObject(tqparent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *parent, const char *name ) + : TQObject(parent, name) { init(); // set up the contents of the props widget @@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties() void GroupWiseContactProperties::init() { - m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( tqparent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); + m_dialog = new KDialogBase( ::tqqt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h index 38cce07d..afb0cd62 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.h +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h @@ -40,11 +40,11 @@ public: /** * Display properties given a GroupWiseContact */ - GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name ); + GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name ); /** * Display properties given a GroupWise::ContactDetails */ - GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *tqparent = 0, const char *name = 0 ); + GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *parent = 0, const char *name = 0 ); ~GroupWiseContactProperties(); protected: void setupProperties( TQMap< TQString, TQString > serverProps ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 43ae480d..7f049d7c 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "gweditaccountwidget.h" -GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* theAccount) -: TQWidget( tqparent ), KopeteEditAccountWidget( theAccount ) +GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* theAccount) +: TQWidget( parent ), KopeteEditAccountWidget( theAccount ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; m_layout = new TQVBoxLayout( this ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h index 24171353..9c21f7fd 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h @@ -38,7 +38,7 @@ class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidg Q_OBJECT TQ_OBJECT public: - GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); + GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account); ~GroupWiseEditAccountWidget(); diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index 462d53ee..e6179882 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -48,8 +48,8 @@ private: TQString m_dn; }; -GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), +GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0) { m_privacy = new GroupWisePrivacyWidget( this ); diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h index 0211e85e..57bb6e83 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.h +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h @@ -36,7 +36,7 @@ class GroupWisePrivacyDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); + GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); ~GroupWisePrivacyDialog(); protected: void commitChanges(); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index d8846bbd..547de1b5 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -33,8 +33,8 @@ #include "gwreceiveinvitationdialog.h" -ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name) - : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, tqparent, name, false ) +ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name) + : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, parent, name, false ) { m_account = account; m_guid = event.guid; diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h index 20cb28e6..688071fd 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h @@ -33,7 +33,7 @@ class ReceiveInvitationDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name ); + ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name ); ~ReceiveInvitationDialog(); signals: void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index dc0788eb..b3f2428e 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -40,8 +40,8 @@ class GWSearchResultsLVI : public TQListViewItem { public: - GWSearchResultsLVI( TQListView * tqparent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) - : TQListViewItem( tqparent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) + GWSearchResultsLVI( TQListView * parent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) + : TQListViewItem( parent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) { setPixmap( 0, statusPM ); } @@ -56,8 +56,8 @@ public: int m_status; }; -GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *tqparent, const char *name) - : GroupWiseContactSearchWidget(tqparent, name), m_account( account ), m_onlineOnly( onlineOnly ) +GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *parent, const char *name) + : GroupWiseContactSearchWidget(parent, name), m_account( account ), m_onlineOnly( onlineOnly ) { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h index c3aee10a..c4e11364 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.h +++ b/kopete/protocols/groupwise/ui/gwsearch.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~GroupWiseContactSearch(); TQValueList< GroupWise::ContactDetails > selectedResults(); signals: @@ -47,7 +47,7 @@ protected slots: void slotClear(); void slotDoSearch(); void slotGotSearchResults(); - // shows a GroupWiseContactProperties for the selected contact. Dialog's tqparent is this instance + // shows a GroupWiseContactProperties for the selected contact. Dialog's parent is this instance void slotShowDetails(); void slotValidateSelection(); private: diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp index 85f2edfb..6b19721c 100644 --- a/kopete/protocols/irc/ircaddcontactpage.cpp +++ b/kopete/protocols/irc/ircaddcontactpage.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kmessagebox.h> -IRCAddContactPage::IRCAddContactPage( TQWidget *tqparent, IRCAccount *a ) : AddContactPage(tqparent, 0) +IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddContactPage(parent, 0) { (new TQVBoxLayout(this))->setAutoAdd(true); ircdata = new ircAddUI(this); diff --git a/kopete/protocols/irc/ircaddcontactpage.h b/kopete/protocols/irc/ircaddcontactpage.h index 100886b4..a843f551 100644 --- a/kopete/protocols/irc/ircaddcontactpage.h +++ b/kopete/protocols/irc/ircaddcontactpage.h @@ -34,7 +34,7 @@ class IRCAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - IRCAddContactPage(TQWidget *tqparent=0, IRCAccount* account = 0); + IRCAddContactPage(TQWidget *parent=0, IRCAccount* account = 0); ~IRCAddContactPage(); ircAddUI *ircdata; diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index 182670d7..d9d5f8e2 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -40,9 +40,9 @@ #include "ircaccount.h" #include "irccontact.h" -IRCGUIClient::IRCGUIClient( Kopete::ChatSession *tqparent ) : TQObject(tqparent) , KXMLGUIClient(tqparent) +IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , KXMLGUIClient(parent) { - Kopete::ContactPtrList members = tqparent->members(); + Kopete::ContactPtrList members = parent->members(); if( members.count() > 0 ) { m_user = static_cast<IRCContact*>( members.first() ); @@ -53,7 +53,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *tqparent ) : TQObject(tqparent) setXMLFile("ircchatui.rc"); unplugActionList( "irccontactactionlist" ); - TQPtrList<KAction> *actions = m_user->customContextMenuActions( tqparent ); + TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); plugActionList( "irccontactactionlist", *actions ); delete actions; */ @@ -62,7 +62,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *tqparent ) : TQObject(tqparent) TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild(); - TQPtrList<KAction> *actions = m_user->customContextMenuActions( tqparent ); + TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); if( actions ) { for( KAction *a = actions->first(); a; a = actions->next() ) diff --git a/kopete/protocols/irc/ircguiclient.h b/kopete/protocols/irc/ircguiclient.h index 10d691ad..4ab832ac 100644 --- a/kopete/protocols/irc/ircguiclient.h +++ b/kopete/protocols/irc/ircguiclient.h @@ -30,7 +30,7 @@ class IRCGUIClient : public TQObject , public KXMLGUIClient Q_OBJECT TQ_OBJECT public: - IRCGUIClient( Kopete::ChatSession *tqparent = 0 ); + IRCGUIClient( Kopete::ChatSession *parent = 0 ); ~IRCGUIClient(); private slots: diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index e30bfa90..a3906164 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -104,8 +104,8 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const newAccount->connect(); } -IRCProtocol::IRCProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( IRCProtocolFactory::instance(), tqparent, name ), +IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( IRCProtocolFactory::instance(), parent, name ), m_ServerStatusOnline(Kopete::OnlineStatus::Online, 100, this, OnlineServer, TQString(), i18n("Online")), @@ -240,12 +240,12 @@ IRCProtocol::IRCProtocol( TQObject *tqparent, const char *name, const TQStringLi Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ban"), TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), - i18n("USAGE: /ban <tqmask> - Add someone to this channel's ban list. (requires operator status)."), + i18n("USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator status)."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("bannick"), TQString::tqfromLatin1("ban %1!*@*"), - i18n("USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the hosttqmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); + i18n("USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("op"), TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), @@ -399,14 +399,14 @@ TQPtrList<KAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Mes return 0L; } -AddContactPage *IRCProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) +AddContactPage *IRCProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) { - return new IRCAddContactPage(tqparent,static_cast<IRCAccount*>(account)); + return new IRCAddContactPage(parent,static_cast<IRCAccount*>(account)); } -KopeteEditAccountWidget *IRCProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *IRCProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new IRCEditAccountWidget(this, static_cast<IRCAccount*>(account),tqparent); + return new IRCEditAccountWidget(this, static_cast<IRCAccount*>(account),parent); } Kopete::Account *IRCProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h index 61a810fd..725f078a 100644 --- a/kopete/protocols/irc/ircprotocol.h +++ b/kopete/protocols/irc/ircprotocol.h @@ -82,11 +82,11 @@ public: OnlineServer = 32768 //! This server is online. }; - IRCProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + IRCProtocol( TQObject *parent, const char *name, const TQStringList &args ); ~IRCProtocol(); /** Kopete::Protocol reimplementation */ - virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account); + virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); /** * Deserialize contact data @@ -94,7 +94,7 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData ); - virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account* createNewAccount(const TQString &accountId); diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 88306027..f7e4ee24 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -21,7 +21,7 @@ #include "kcodecaction.h" KCodecAction::KCodecAction( const TQString &text, const KShortcut &cut, - TQObject *tqparent, const char *name ) : KSelectAction( text, "", cut, tqparent, name ) + TQObject *parent, const char *name ) : KSelectAction( text, "", cut, parent, name ) { TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( slotActivated( const TQString & ) ) ); diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h index 1cd408ab..b2e4dd55 100644 --- a/kopete/protocols/irc/kcodecaction.h +++ b/kopete/protocols/irc/kcodecaction.h @@ -32,7 +32,7 @@ class KCodecAction : public KSelectAction TQ_OBJECT public: KCodecAction( const TQString &text, const KShortcut &cut = KShortcut(), - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); void setCodec( const TQTextCodec *codec ); diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 786b4594..da32d591 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -53,8 +53,8 @@ using namespace KIRC; */ const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") ); -Engine::Engine(TQObject *tqparent, const char *name) - : TQObject(tqparent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), +Engine::Engine(TQObject *parent, const char *name) + : TQObject(parent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), m_status(Idle), m_FailedNickOnLogin(false), m_useSSL(false), diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index ac3fb00c..d6b8c32b 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -106,7 +106,7 @@ public: MessageOfTheDayCondensedMessage }; - Engine( TQObject *tqparent = 0, const char* name = 0 ); + Engine( TQObject *parent = 0, const char* name = 0 ); ~Engine(); // TQString nick() const; diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp index f8c3dcca..4295a2ee 100644 --- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp @@ -227,7 +227,7 @@ void Engine::user(const TQString &newUserName, const TQString &hostname, const T void Engine::user(const TQString &newUserName, TQ_UINT8 mode, const TQString &newRealName) { /* RFC2812: "<user> <mode> <unused> <realname>" - * mode is a numeric value (from a bit tqmask). + * mode is a numeric value (from a bit mask). * 0x00 normal * 0x04 request +w * 0x08 request +i */ diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index 198009a3..3c6d1907 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -28,8 +28,8 @@ using namespace KIRC; Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Type type, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), @@ -41,8 +41,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ? - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), @@ -55,8 +55,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress TQHostAddress hostAdress, TQ_UINT16 port, // put this in a TQVariant ? Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ? - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), @@ -68,8 +68,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress /* Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Transfer::Type type, TQVariant properties, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(properties[socket]), m_initiated(false), diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h index 3794e744..950c0e96 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.h +++ b/kopete/protocols/irc/libkirc/kirctransfer.h @@ -59,23 +59,23 @@ public: public: Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress Type type = Unknown, - TQObject *tqparent = 0L, const char *name = 0L ); + TQObject *parent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, - TQObject *tqparent = 0L, const char *name = 0L ); + TQObject *parent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, - TQObject *tqparent = 0L, const char *name = 0L ); + TQObject *parent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, - TQObject *tqparent = 0L, const char *name = 0L ); + TQObject *parent = 0L, const char *name = 0L ); /* For a file transfer properties are: @@ -91,7 +91,7 @@ public: *//* Transfer( KIRC *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, TQVariant properties, - TQObject *tqparent = 0L, const char *name = 0L ); + TQObject *parent = 0L, const char *name = 0L ); */ ~Transfer(); diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp index ee9e38c1..25b41ff9 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp @@ -25,16 +25,16 @@ using namespace KIRC; /* -TransferServer::TransferServer( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), +TransferServer::TransferServer( TQObject *parent, const char *name ) + : TQObject( parent, name ), m_socket( 0 ), m_port( 0 ), m_backlog( 1 ) { } */ -TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *tqparent, const char *name) - : TQObject( tqparent, name ), +TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *parent, const char *name) + : TQObject( parent, name ), m_socket( 0 ), m_port( port ), m_backlog( backlog ) @@ -44,8 +44,8 @@ TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *tqparent, TransferServer::TransferServer(Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, - TQObject *tqparent, const char *name) - : TQObject( tqparent, name ), + TQObject *parent, const char *name) + : TQObject( parent, name ), m_socket(0), m_port(0), m_backlog(1), diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.h b/kopete/protocols/irc/libkirc/kirctransferserver.h index a84000e2..e013d9db 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.h +++ b/kopete/protocols/irc/libkirc/kirctransferserver.h @@ -37,12 +37,12 @@ class TransferServer TQ_OBJECT public: -// TransferServer(TQObject *tqparent = 0, const char *name = 0); - TransferServer(TQ_UINT16 port, int backlog = 1, TQObject *tqparent = 0, const char *name = 0); +// TransferServer(TQObject *parent = 0, const char *name = 0); + TransferServer(TQ_UINT16 port, int backlog = 1, TQObject *parent = 0, const char *name = 0); TransferServer(KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, TQString fileName, TQ_UINT32 fileSize, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~TransferServer(); diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 4dcf9ce8..2bf3910a 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -326,7 +326,7 @@ int KSSLSocket::verifyCertificate() setMetaData("ssl_action", "accept"); } - // Since we're the tqparent, we need to teach the child. + // Since we're the parent, we need to teach the child. setMetaData("ssl_parent_ip", ourIp ); setMetaData("ssl_parent_cert", pc.toString()); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 2d5e0b13..6426224a 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -41,7 +41,7 @@ class ChannelListItem : public KListViewItem { public: - ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ); + ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ); virtual int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -49,8 +49,8 @@ class ChannelListItem : public KListViewItem KListView *parentList; }; -ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) : - KListViewItem( tqparent, tqparent->lastItem() ), parentList( tqparent ) +ChannelListItem::ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : + KListViewItem( parent, parent->lastItem() ), parentList( parent ) { setText(0, arg1); setText(1, arg2); @@ -165,8 +165,8 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum p->drawPixmap( 0, 0, back ); } -ChannelList::ChannelList( TQWidget* tqparent, KIRC::Engine *engine ) - : TQWidget( tqparent ), m_engine( engine ) +ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) + : TQWidget( parent ), m_engine( engine ) { ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout"); diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index d907efcb..a5963b6b 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -41,7 +41,7 @@ class ChannelList TQ_OBJECT public: - ChannelList( TQWidget *tqparent, KIRC::Engine *engine ); + ChannelList( TQWidget *parent, KIRC::Engine *engine ); public slots: void search(); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 6717bb21..8a7cdcfb 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -46,8 +46,8 @@ #include <tqlistbox.h> #include <tqlineedit.h> -IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, TQWidget *tqparent, const char * ) - : IRCEditAccountBase(tqparent), KopeteEditAccountWidget(ident) +IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, TQWidget *parent, const char * ) + : IRCEditAccountBase(parent), KopeteEditAccountWidget(ident) { mProtocol = proto; diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.h b/kopete/protocols/irc/ui/irceditaccountwidget.h index 025dc5fb..ba2d334f 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.h +++ b/kopete/protocols/irc/ui/irceditaccountwidget.h @@ -32,7 +32,7 @@ class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccount TQ_OBJECT public: - IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *tqparent=0, const char *name=0); + IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *parent=0, const char *name=0); ~IRCEditAccountWidget(); IRCAccount *account(); diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 4f22a622..f3212f93 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -87,12 +87,12 @@ -JabberAccount::JabberAccount (JabberProtocol * tqparent, const TQString & accountId, const char *name) - :Kopete::PasswordedAccount ( tqparent, accountId, 0, name ) +JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountId, const char *name) + :Kopete::PasswordedAccount ( parent, accountId, 0, name ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Instantiating new account " << accountId << endl; - m_protocol = tqparent; + m_protocol = parent; m_jabberClient = 0L; diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 04b79770..17286a90 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -60,7 +60,7 @@ class JabberAccount : public Kopete::PasswordedAccount TQ_OBJECT public: - JabberAccount (JabberProtocol * tqparent, const TQString & accountID, const char *name = 0L); + JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L); ~JabberAccount (); /* Returns the action menu for this account. */ diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 5b69d489..661f0974 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -26,7 +26,7 @@ #include "xmpp_tasks.h" -JabberBookmarks::JabberBookmarks(JabberAccount *tqparent) : TQObject(tqparent) , m_account(tqparent) +JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) { connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); } @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *tqparent) +KAction * JabberBookmarks::bookmarksAction(TQObject *parent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , tqparent , "actionBookMark" ); + KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 55165a1e..65ea8e36 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -41,7 +41,7 @@ class JabberBookmarks : public TQObject /** * Constructor */ - JabberBookmarks(JabberAccount *tqparent); + JabberBookmarks(JabberAccount *parent); ~JabberBookmarks(){} /** @@ -53,7 +53,7 @@ class JabberBookmarks : public TQObject /** * return an action that will be added in the jabber popup menu */ - KAction *bookmarksAction(TQObject * tqparent); + KAction *bookmarksAction(TQObject * parent); private slots: void accountConnected(); void slotReceivedBookmarks(); diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index 4629eef2..1021757d 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -24,8 +24,8 @@ #include <kresolver.h> #include "jabberprotocol.h" -JabberByteStream::JabberByteStream ( TQObject *tqparent, const char */*name*/ ) - : ByteStream ( tqparent ) +JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ ) + : ByteStream ( parent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new Jabber byte stream." << endl; diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index 0bc2e204..91351160 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - JabberByteStream ( TQObject *tqparent = 0, const char *name = 0 ); + JabberByteStream ( TQObject *parent = 0, const char *name = 0 ); ~JabberByteStream (); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 6161099e..bb637870 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -483,7 +483,7 @@ void JabberCapabilitiesManager::discoRequestFinished() } else { - TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); + TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); if( jidAccountPair.second ) { kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index 4653803f..f2d74eab 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -22,8 +22,8 @@ #include "jabberbytestream.h" #include "jabberprotocol.h" -JabberConnector::JabberConnector ( TQObject *tqparent, const char */*name*/ ) - : XMPP::Connector ( tqparent ) +JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) + : XMPP::Connector ( parent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl; diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index e6f12988..f4a561e9 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - JabberConnector ( TQObject *tqparent = 0, const char *name = 0 ); + JabberConnector ( TQObject *parent = 0, const char *name = 0 ); ~JabberConnector (); diff --git a/kopete/protocols/jabber/jabberformlineedit.cpp b/kopete/protocols/jabber/jabberformlineedit.cpp index 235faffe..991d4a56 100644 --- a/kopete/protocols/jabber/jabberformlineedit.cpp +++ b/kopete/protocols/jabber/jabberformlineedit.cpp @@ -17,8 +17,8 @@ #include "jabberformlineedit.h" -JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):TQLineEdit (value, - tqparent, +JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):TQLineEdit (value, + parent, name) { @@ -38,7 +38,7 @@ JabberFormLineEdit::~JabberFormLineEdit () { } -JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):KPasswordEdit(tqparent, name) +JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):KPasswordEdit(parent, name) { setText(value); diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index 8ed1defc..d4f0de39 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -35,7 +35,7 @@ class JabberFormLineEdit:public TQLineEdit TQ_OBJECT public: - JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); + JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); ~JabberFormLineEdit (); public slots:void slotGatherData (XMPP::Form & form); @@ -53,7 +53,7 @@ class JabberFormPasswordEdit:public KPasswordEdit TQ_OBJECT public: - JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); + JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); public slots:void slotGatherData (XMPP::Form & form); diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 08fd3cfe..de789f44 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -22,7 +22,7 @@ #include "jabberformlineedit.h" #include "jabberformtranslator.h" -JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent, const char *name):TQWidget (tqparent, name) +JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * parent, const char *name):TQWidget (parent, name) { /* Copy basic form values. */ privForm.setJid (form.jid ()); diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h index 1718ec4b..2ee316d6 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent = 0, const char *name = 0); + JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0); ~JabberFormTranslator (); XMPP::Form & resultData (); diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index 87b797c3..abb119df 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -69,8 +69,8 @@ typedef KGenericFactory<JabberProtocol> JabberProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" ) ) -JabberProtocol::JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &) -: Kopete::Protocol( JabberProtocolFactory::instance(), tqparent, name ), +JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) +: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage), @@ -155,18 +155,18 @@ JabberProtocol::~JabberProtocol () -AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * tqparent, Kopete::Account * i) +AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact Widget\n" << endl; - return new JabberAddContactPage (i, tqparent); + return new JabberAddContactPage (i, parent); } -KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent) +KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Edit Account Widget\n" << endl; JabberAccount *ja=dynamic_cast < JabberAccount * >(account); if(ja || !account) - return new JabberEditAccountWidget (this,ja , tqparent); + return new JabberEditAccountWidget (this,ja , parent); else { JabberTransport *transport = dynamic_cast < JabberTransport * >(account); diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 696d572b..0e79c357 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -56,14 +56,14 @@ public: /** * Object constructor and destructor */ - JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &); + JabberProtocol (TQObject * parent, const char *name, const TQStringList &); ~JabberProtocol (); /** * Creates the "add contact" dialog specific to this protocol */ - virtual AddContactPage *createAddContactWidget (TQWidget * tqparent, Kopete::Account * i); - virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent); + virtual AddContactPage *createAddContactWidget (TQWidget * parent, Kopete::Account * i); + virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * parent); virtual Kopete::Account *createNewAccount (const TQString & accountId); /** diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 3f14fcc5..f0a2ab81 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -45,7 +45,7 @@ class JabberTransport : public Kopete::Account public: /** * constructor called when the transport is created by info from server (i.e not when loading kopete) - * @param parentAccount is the tqparent jabber account. + * @param parentAccount is the parent jabber account. * @param item is the roster item of the gateway * @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon */ @@ -53,7 +53,7 @@ public: /** * constructor called when the transport is loaded from config - * @param parentAccount is the tqparent jabber account. + * @param parentAccount is the parent jabber account. * @param accountId is the accountId */ JabberTransport (JabberAccount * parentAccount, const TQString &accountId ); @@ -63,7 +63,7 @@ public: /** Returns the action menu for this account. */ virtual KActionMenu *actionMenu (); - /** the tqparent account */ + /** the parent account */ JabberAccount *account() const { return m_account; } diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index 766da28e..c9979411 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -55,8 +55,8 @@ class JingleSessionManager; class JingleSessionManager::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleSessionManager *tqparent) - : sessionManager(tqparent) + SlotsProxy(JingleSessionManager *parent) + : sessionManager(parent) {} void OnSignalingRequest() diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 594be2d4..4208e0d8 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -55,7 +55,7 @@ public: * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) +JingleITQResponder::JingleITQResponder(Task *parent) :Task(parent) { } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 0225b177..c5bc775d 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -74,8 +74,8 @@ static bool hasPeer(const JingleVoiceSession::JidList &jidList, const XMPP::Jid class JingleVoiceSession::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleVoiceSession *tqparent) - : voiceSession(tqparent) + SlotsProxy(JingleVoiceSession *parent) + : voiceSession(parent) {} void OnCallCreated(cricket::Call* call) @@ -167,7 +167,7 @@ public: * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) +JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *parent) :Task(parent) { } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index d5086a1a..a389730b 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -40,8 +40,8 @@ using namespace XMPP; -JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent, const char *name) - : JingleVoiceSessionDialogBase(tqparent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) +JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent, const char *name) + : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); setCaption( i18n("Voice session with %1").tqarg(contactJid) ); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index e782af03..738b2cb4 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -34,7 +34,7 @@ class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; - JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent = 0, const char *name = 0); + JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent = 0, const char *name = 0); ~JingleVoiceSessionDialog(); public slots: diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp index f37bc6d6..571f9ff6 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp @@ -23,8 +23,8 @@ #define JINGLE_NS "http://www.google.com/session" -JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *tqparent) - : Task(tqparent) +JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *parent) + : Task(parent) {} JingleWatchSessionTask::~JingleWatchSessionTask() diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 0b53280e..8c37b0c8 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -28,7 +28,7 @@ class JingleWatchSessionTask : public XMPP::Task Q_OBJECT TQ_OBJECT public: - JingleWatchSessionTask(XMPP::Task *tqparent); + JingleWatchSessionTask(XMPP::Task *parent); ~JingleWatchSessionTask(); bool take(const TQDomElement &element); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index 09655472..6d85cb0d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -32,9 +32,9 @@ namespace buzz { -Task::Task(Task * tqparent) : +Task::Task(Task * parent) : state_(STATE_INIT), - parent_(tqparent), + parent_(parent), blocked_(false), done_(false), aborted_(false), @@ -42,7 +42,7 @@ Task::Task(Task * tqparent) : error_(false), child_error_(false), start_time_(0) { - runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); + runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner()); if (parent_ != NULL) { parent_->AddChild(this); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index c583bda8..7140b691 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,12 +61,12 @@ // might be working on something as you send it infomration, you may want // to have a queue in the task. // -// (3) Finally it helps manage tqparent tasks and tqchildren. If a tqparent +// (3) Finally it helps manage parent tasks and tqchildren. If a parent // task gets aborted, all the tqchildren tasks are too. The nice thing -// about this, for example, is if you have one tqparent task that +// about this, for example, is if you have one parent task that // represents, say, and Xmpp connection, then you can spawn a whole bunch // of infinite lifetime child tasks and now worry about cleaning them up. -// When the tqparent task goes to STATE_DONE, the task engine will make +// When the parent task goes to STATE_DONE, the task engine will make // sure all those tqchildren are aborted and get deleted. // // Notice that Task has a few built-in states, e.g., @@ -103,7 +103,7 @@ class RootTask; class Task { public: - Task(Task * tqparent); + Task(Task * parent); virtual ~Task() {} void Start(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h index 7307a522..47660514 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -28,7 +28,7 @@ namespace buzz { class PresenceOutTask : public XmppTask { public: - PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {} + PresenceOutTask(Task * parent) : XmppTask(parent) {} virtual ~PresenceOutTask() {} XmppReturntqStatus Send(const tqStatus & s); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h index 2ed5ac46..06c68015 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -30,7 +30,7 @@ namespace buzz { class PresencePushTask : public XmppTask { public: - PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {} + PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); sigslot::signal1<const tqStatus &>SignalStatusUpdate; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h index fe6f0f6c..fa07d2ec 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h @@ -50,7 +50,7 @@ class MediaEngine { bool operator <(const Codec& c) const { return preference > c.preference; } }; - // Bittqmask flags for options that may be supported by the media engine implementation + // Bitmask flags for options that may be supported by the media engine implementation enum MediaEngineOptions { AUTO_GAIN_CONTROL = 1 << 1, }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h index 5b75af3c..a5326893 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h @@ -36,8 +36,8 @@ namespace cricket { class Receiver : public buzz::XmppTask { public: - Receiver(Task *tqparent, SessionClient *session_client) - : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_TYPE) { + Receiver(Task *parent, SessionClient *session_client) + : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) { session_client_ = session_client; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h index 5f67d58b..57564ad0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h @@ -45,8 +45,8 @@ namespace cricket { // session_client is guaranteed to outlive the xmpp session. class SessionSendTask : public buzz::XmppTask { public: - SessionSendTask(Task *tqparent, SessionClient *session_client) - : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE), + SessionSendTask(Task *parent, SessionClient *session_client) + : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE), session_client_(session_client), timed_out_(false) { } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c index 6d8868d6..24cc5a3f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c @@ -279,7 +279,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) { if (err!=-EPIPE){ @@ -289,7 +289,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) g_warning("alsa_card_read: snd_pcm_readi() failed:%s.",snd_strerror(err)); } - sigproctqmask(SIG_UNBLOCK,&set,NULL); + sigprocmask(SIG_UNBLOCK,&set,NULL); return err*obj->frame_size; } @@ -322,7 +322,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); if ((err=snd_pcm_writei(obj->write_handle,buf,size/obj->frame_size))<0){ if (err!=-EPIPE){ g_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err)); @@ -332,7 +332,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) if (err<0) g_warning("alsa_card_write: Error writing sound buffer (size=%i):%s",size,snd_strerror(err)); } - sigproctqmask(SIG_UNBLOCK,&set,NULL); + sigprocmask(SIG_UNBLOCK,&set,NULL); return err; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h index 9ee33ef4..1d7ba3a0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h @@ -27,7 +27,7 @@ #include <alsa/asoundlib.h> struct _AlsaCard { - SndCard tqparent; + SndCard parent; gchar *pcmdev; gchar *mixdev; snd_pcm_t *read_handle; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h index 30128191..3f5ad16f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h @@ -44,14 +44,14 @@ static inline int val_seg(int val) static inline unsigned char s16_to_alaw(int pcm_val) { - int tqmask; + int mask; int seg; unsigned char aval; if (pcm_val >= 0) { - tqmask = 0xD5; + mask = 0xD5; } else { - tqmask = 0x55; + mask = 0x55; pcm_val = -pcm_val; if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -64,7 +64,7 @@ static inline unsigned char s16_to_alaw(int pcm_val) seg = val_seg(pcm_val); aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); } - return aval ^ tqmask; + return aval ^ mask; } /* @@ -119,16 +119,16 @@ static inline int alaw_to_s16(unsigned char a_val) static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit range) */ { - int tqmask; + int mask; int seg; unsigned char uval; if (pcm_val < 0) { pcm_val = 0x84 - pcm_val; - tqmask = 0x7f; + mask = 0x7f; } else { pcm_val += 0x84; - tqmask = 0xff; + mask = 0xff; } if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -141,7 +141,7 @@ static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit r * and complement the code word. */ uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); - return uval ^ tqmask; + return uval ^ mask; } /* diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c index fe98df74..8a636c99 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c @@ -194,7 +194,7 @@ void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a) g_warning("hpux_snd_card_set_level: unsupported command."); return; } - gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_WRONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_SET_GAINS,&gain); @@ -210,7 +210,7 @@ gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way) int p=0,mix_fd,error; g_return_if_fail(obj->mixdev_name!=NULL); - gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_RDONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_GET_GAINS,&gain); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h index ae6f1c7c..0118e035 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h @@ -54,7 +54,7 @@ typedef struct { struct _JackCard { - SndCard tqparent; + SndCard parent; jack_client_t *client; gboolean jack_running; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h index 9c7d5ab3..0ce08618 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h @@ -36,7 +36,7 @@ struct _MSSdlOut { - MSFilter tqparent; + MSFilter parent; MSQueue *input[2]; gint width,height; const gchar *format; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h index 9c7f7fc4..370af69e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h @@ -27,7 +27,7 @@ struct _MSSpeexDec { - MSFilter tqparent; + MSFilter parent; MSQueue *inq[1]; /* speex has an input q because it can be variable bit rate */ MSFifo *outf[1]; void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexDec MSSpeexDec; struct _MSSpeexDecClass { - MSFilterClass tqparent; + MSFilterClass parent; }; typedef struct _MSSpeexDecClass MSSpeexDecClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h index 2325ba23..f63edfcd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h @@ -27,7 +27,7 @@ struct _MSSpeexEnc { - MSFilter tqparent; + MSFilter parent; MSFifo *inf[1]; MSQueue *outq[1]; /* speex has an output q because it can be variable bit rate */ void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexEnc MSSpeexEnc; struct _MSSpeexEncClass { - MSFilterClass tqparent; + MSFilterClass parent; }; typedef struct _MSSpeexEncClass MSSpeexEncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h index 950187b8..3dc5ee04 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h @@ -27,7 +27,7 @@ struct _MSV4l { - MSVideoSource tqparent; + MSVideoSource parent; int fd; char *device; struct video_capability cap; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h index 6413c682..0f1e09ab 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h @@ -27,7 +27,7 @@ #define OSS_CARD_BUFFERS 3 struct _OssCard { - SndCard tqparent; + SndCard parent; gchar *dev_name; /* /dev/dsp0 for example */ gchar *mixdev_name; /* /dev/mixer0 for example */ gint fd; /* the file descriptor of the open soundcard, 0 if not open*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h index caf906df..2ffc6cd1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h @@ -24,7 +24,7 @@ typedef struct _PortAudioCard { - SndCard tqparent; + SndCard parent; PortAudioStream* stream; char *out_buffer, *out_buffer_read, *out_buffer_write, *out_buffer_end; char *in_buffer, *in_buffer_read, *in_buffer_write, *in_buffer_end; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c index 1ac35d9c..80e07682 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c @@ -101,7 +101,7 @@ void ortp_scheduler_init() sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigproctqmask(SIG_BLOCK,&set,NULL); + sigprocmask(SIG_BLOCK,&set,NULL); #endif /* __hpux */ if (!g_thread_supported()) g_thread_init(NULL); __ortp_scheduler=rtp_scheduler_new(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h index 7518e075..e7702000 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h @@ -177,7 +177,7 @@ struct _RtpSession RtpSessionMode mode; struct _RtpScheduler *sched; guint32 flags; - gint mask_pos; /* the position in the scheduler tqmask of RtpSession */ + gint mask_pos; /* the position in the scheduler mask of RtpSession */ gpointer user_data; /* telephony events extension */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c index bee787a2..17ff6748 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c @@ -148,7 +148,7 @@ gpointer rtp_scheduler_schedule(gpointer psched) g_mutex_unlock(sched->lock); /* now while the scheduler is going to sleep, the other threads can compute their - result tqmask and see if they have to leave, or to wait for next tick*/ + result mask and see if they have to leave, or to wait for next tick*/ //g_message("scheduler: sleeping."); timer->timer_do(); sched->time_+=sched->timer_inc; @@ -174,7 +174,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session) if (sched->max_sessions==0){ g_error("rtp_scheduler_add_session: max_session=0 !"); } - /* find a free pos in the session tqmask*/ + /* find a free pos in the session mask*/ for (i=0;i<sched->max_sessions;i++){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ session->mask_pos=i; @@ -229,7 +229,7 @@ void rtp_scheduler_remove_session(RtpScheduler *sched, RtpSession *session) } } rtp_session_unset_flag(session,RTP_SESSION_IN_SCHEDULER); - /* delete the bit in the tqmask */ + /* delete the bit in the mask */ session_set_clr(&sched->all_sessions,session); rtp_scheduler_unlock(sched); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h index 4dcd9afb..91cde6a9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h @@ -29,13 +29,13 @@ struct _RtpScheduler { RtpSession *list; /* list of scheduled sessions*/ - SessionSet all_sessions; /* tqmask of scheduled sessions */ - gint all_max; /* the highest pos in the all tqmask */ - SessionSet r_sessions; /* tqmask of sessions that have a recv event */ + SessionSet all_sessions; /* mask of scheduled sessions */ + gint all_max; /* the highest pos in the all mask */ + SessionSet r_sessions; /* mask of sessions that have a recv event */ gint r_max; - SessionSet w_sessions; /* tqmask of sessions that have a send event */ + SessionSet w_sessions; /* mask of sessions that have a send event */ gint w_max; - SessionSet e_sessions; /* tqmask of session that have error event */ + SessionSet e_sessions; /* mask of session that have error event */ gint e_max; gint max_sessions; /* the number of position in the masks */ /* GMutex *unblock_select_mutex; */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c index 36856a99..7b5ad921 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c @@ -60,27 +60,27 @@ void session_set_destroy(SessionSet *set) gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, SessionSet *result_set) { - guint32 *tqmask1,*tqmask2,*tqmask3; + guint32 *mask1,*mask2,*mask3; gint i=0; gint j,ret=0; - tqmask1=(guint32*)&sched_set->rtpset; - tqmask2=(guint32*)&user_set->rtpset; - tqmask3=(guint32*)&result_set->rtpset; + mask1=(guint32*)&sched_set->rtpset; + mask2=(guint32*)&user_set->rtpset; + mask3=(guint32*)&result_set->rtpset; while(i<maxs+1){ - *tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two masks*/ + *mask3=(*mask1) & (*mask2); /* computes the AND between the two masks*/ /* and unset the sessions that have been found from the sched_set */ - *tqmask1=(*tqmask1) & (~(*tqmask3)); - if ((*tqmask3)!=0){ + *mask1=(*mask1) & (~(*mask3)); + if ((*mask3)!=0){ for (j=0;j<32;j++){ - if ( ((*tqmask3)>>j) & 1){ + if ( ((*mask3)>>j) & 1){ ret++; } } } i+=32; - tqmask1++; - tqmask2++; - tqmask3++; + mask1++; + mask2++; + mask3++; } //printf("session_set_and: ret=%i\n",ret); return ret; @@ -120,8 +120,8 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors) rtp_scheduler_lock(sched); while(1){ - /* computes the SessionSet intersection (in the other words tqmask intersection) between - the tqmask given by the user and scheduler masks */ + /* computes the SessionSet intersection (in the other words mask intersection) between + the mask given by the user and scheduler masks */ if (recvs!=NULL){ bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp); if (bits>0){ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h index 8d166222..623b9d10 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h @@ -45,7 +45,7 @@ typedef fd_set ortp_fd_set; do { \ unsigned int __i; \ ortp_fd_set *__arr = (s); \ - for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__i) \ + for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_mask); ++__i) \ ORTP__FDS_BITS (__arr)[__i] = 0; \ } while (0) #define ORTP_FD_SET(d, s) (ORTP__FDS_BITS (s)[ORTP__FDELT(d)] |= ORTP__FDMASK(d)) @@ -55,22 +55,22 @@ typedef fd_set ortp_fd_set; /* The fd_set member is required to be an array of longs. */ -typedef long int ortp__fd_tqmask; +typedef long int ortp__fd_mask; /* Number of bits per word of `fd_set' (some code assumes this is 32). */ #define ORTP__FD_SETSIZE 1024 /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ -#define ORTP__NFDBITS (8 * sizeof (ortp__fd_tqmask)) +#define ORTP__NFDBITS (8 * sizeof (ortp__fd_mask)) #define ORTP__FDELT(d) ((d) / ORTP__NFDBITS) -#define ORTP__FDMASK(d) ((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS)) +#define ORTP__FDMASK(d) ((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS)) /* fd_set for select and pselect. */ typedef struct { - ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; + ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; # define ORTP__FDS_BITS(set) ((set)->fds_bits) } ortp_fd_set; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index f5b9d0b4..fa6a14a6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc @@ -245,7 +245,7 @@ XmppClient::Disconnect() { return XMPP_RETURN_OK; } -XmppClient::XmppClient(Task * tqparent) : Task(tqparent), +XmppClient::XmppClient(Task * parent) : Task(parent), delivering_signal_(false) { d_.reset(new Private(this)); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h index 540d774d..fd65c39c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h @@ -51,9 +51,9 @@ class CaptchaChallenge; // ///////////////////////////////////////////////////////////////////// // -// See Task first. XmppClient is a tqparent task for XmppTasks. +// See Task first. XmppClient is a parent task for XmppTasks. // -// XmppClient is a task which is designed to be the tqparent task for +// XmppClient is a task which is designed to be the parent task for // all tasks that depend on a single Xmpp connection. If you want to, // for example, listen for subscription requests forever, then your // listener should be a task that is a child of the XmppClient that owns @@ -71,7 +71,7 @@ class CaptchaChallenge; class XmppClient : public Task, public sigslot::has_slots<> { public: - XmppClient(Task * tqparent); + XmppClient(Task * parent); ~XmppClient(); XmppReturntqStatus Connect(const XmppClientSettings & settings, diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index 38ed1994..e7ac0e04 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc @@ -32,9 +32,9 @@ namespace buzz { -XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level) - : Task(tqparent), client_(NULL) { - XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE); +XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level) + : Task(parent), client_(NULL) { + XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE); client_ = client; id_ = client->NextId(); client->AddXmppTask(this, level); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index d84019a2..a1ed3dd3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -45,7 +45,7 @@ namespace buzz { // See Task and XmppClient first. // // XmppTask is a task that is designed to go underneath XmppClient and be -// useful there. It has a way of finding its XmppClient tqparent so you +// useful there. It has a way of finding its XmppClient parent so you // can have it nested arbitrarily deep under an XmppClient and it can // still find the XMPP services. // @@ -69,7 +69,7 @@ class XmppTask : public sigslot::has_slots<> { public: - XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } diff --git a/kopete/protocols/jabber/libiris/001_last_activity.patch b/kopete/protocols/jabber/libiris/001_last_activity.patch index 4e91b8ef..24673e80 100644 --- a/kopete/protocols/jabber/libiris/001_last_activity.patch +++ b/kopete/protocols/jabber/libiris/001_last_activity.patch @@ -51,8 +51,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + QString message; +}; + -+JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) -+:Task(tqparent) ++JT_GetLastActivity::JT_GetLastActivity(Task *parent) ++:Task(parent) +{ + d = new Private; +} @@ -110,4 +110,4 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- - JT_GetServices::JT_GetServices(Task *tqparent) + JT_GetServices::JT_GetServices(Task *parent) diff --git a/kopete/protocols/jabber/libiris/004_xhtml_im.patch b/kopete/protocols/jabber/libiris/004_xhtml_im.patch index feba04bb..990ab4f7 100644 --- a/kopete/protocols/jabber/libiris/004_xhtml_im.patch +++ b/kopete/protocols/jabber/libiris/004_xhtml_im.patch @@ -127,17 +127,17 @@ Index: iris/xmpp-im/types.cpp } - + if ( !d->xHTMLBody.isEmpty()) { -+ QDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); ++ QDomElement parent = s.createElement(s.xhtmlImNS(), "html"); + for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { + const QString &str = it.data(); + if(!str.isEmpty()) { + QDomElement child = s.createXHTMLElement(str); + if(!it.key().isEmpty()) + child.setAttributeNS(NS_XML, "xml:lang", it.key()); -+ tqparent.appendChild(child); ++ parent.appendChild(child); + } + } -+ s.appendChild(tqparent); ++ s.appendChild(parent); + } if(d->type == "error") s.setError(d->error); diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch index 844d5e3f..4632af45 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -63,7 +63,7 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_MucPresence(Task *tqparent); ++ JT_MucPresence(Task *parent); + ~JT_MucPresence(); + + void pres(const tqStatus &); @@ -92,8 +92,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- +// JT_MucPresence +//---------------------------------------------------------------------------- -+JT_MucPresence::JT_MucPresence(Task *tqparent) -+:Task(tqparent) ++JT_MucPresence::JT_MucPresence(Task *parent) ++:Task(parent) +{ + type = -1; +} diff --git a/kopete/protocols/jabber/libiris/006_private_storage.patch b/kopete/protocols/jabber/libiris/006_private_storage.patch index 35031fec..288d24c5 100644 --- a/kopete/protocols/jabber/libiris/006_private_storage.patch +++ b/kopete/protocols/jabber/libiris/006_private_storage.patch @@ -11,7 +11,7 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_PrivateStorage(Task *tqparent); ++ JT_PrivateStorage(Task *parent); + ~JT_PrivateStorage(); + + void set(const QDomElement &); @@ -53,8 +53,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + int type; +}; + -+JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) -+ :Task(tqparent) ++JT_PrivateStorage::JT_PrivateStorage(Task *parent) ++ :Task(parent) +{ + d = new Private; +} diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index 3d54cc16..27184748 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -58,8 +58,8 @@ public: SafeDelete sd; }; -BSocket::BSocket(TQObject *tqparent) -:ByteStream(tqparent) +BSocket::BSocket(TQObject *parent) +:ByteStream(parent) { d = new Private; #ifndef NO_NDNS diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 246f61a0..25e33c04 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -34,7 +34,7 @@ class BSocket : public ByteStream public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; enum State { Idle, HostLookup, Connecting, Connected, Closing }; - BSocket(TQObject *tqparent=0); + BSocket(TQObject *parent=0); ~BSocket(); void connectToHost(const TQString &host, TQ_UINT16 port); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index ca3b804c..6abeb556 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -96,8 +96,8 @@ public: bool active; }; -HttpConnect::HttpConnect(TQObject *tqparent) -:ByteStream(tqparent) +HttpConnect::HttpConnect(TQObject *parent) +:ByteStream(parent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 2f2ed13f..6c73acd5 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -31,7 +31,7 @@ class HttpConnect : public ByteStream TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpConnect(TQObject *tqparent=0); + HttpConnect(TQObject *parent=0); ~HttpConnect(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index fbc9a39f..cd5b2f64 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -82,8 +82,8 @@ public: int polltime; }; -HttpPoll::HttpPoll(TQObject *tqparent) -:ByteStream(tqparent) +HttpPoll::HttpPoll(TQObject *parent) +:ByteStream(parent) { d = new Private; @@ -438,8 +438,8 @@ public: TQString host; }; -HttpProxyPost::HttpProxyPost(TQObject *tqparent) -:TQObject(tqparent) +HttpProxyPost::HttpProxyPost(TQObject *parent) +:TQObject(parent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index 02034fee..a4c542f6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -31,7 +31,7 @@ class HttpPoll : public ByteStream TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpPoll(TQObject *tqparent=0); + HttpPoll(TQObject *parent=0); ~HttpPoll(); void setAuth(const TQString &user, const TQString &pass=""); @@ -74,7 +74,7 @@ class HttpProxyPost : public TQObject TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpProxyPost(TQObject *tqparent=0); + HttpProxyPost(TQObject *parent=0); ~HttpProxyPost(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index b94399ce..7db5defb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -256,9 +256,9 @@ void NDnsManager::app_aboutToQuit() //! This signal is emitted when the DNS resolution succeeds or fails. //! -//! Constructs an NDns object with tqparent \a tqparent. -NDns::NDns(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs an NDns object with parent \a parent. +NDns::NDns(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index b48ff75e..3b000d9b 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -37,7 +37,7 @@ class NDns : public TQObject Q_OBJECT TQ_OBJECT public: - NDns(TQObject *tqparent=0); + NDns(TQObject *parent=0); ~NDns(); void resolve(const TQString &); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 2968968c..0e0b5337 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -33,8 +33,8 @@ public: ServSockSignal *serv; }; -ServSock::ServSock(TQObject *tqparent) -:TQObject(tqparent) +ServSock::ServSock(TQObject *parent) +:TQObject(parent) { d = new Private; d->serv = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index 0fddf2e0..fe63abef 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -30,7 +30,7 @@ class ServSock : public TQObject Q_OBJECT TQ_OBJECT public: - ServSock(TQObject *tqparent=0); + ServSock(TQObject *parent=0); ~ServSock(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index 7948dcd7..16f02e07 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -527,16 +527,16 @@ public: int udpPort; }; -SocksClient::SocksClient(TQObject *tqparent) -:ByteStream(tqparent) +SocksClient::SocksClient(TQObject *parent) +:ByteStream(parent) { init(); d->incoming = false; } -SocksClient::SocksClient(int s, TQObject *tqparent) -:ByteStream(tqparent) +SocksClient::SocksClient(int s, TQObject *parent) +:ByteStream(parent) { init(); @@ -1102,8 +1102,8 @@ public: TQSocketNotifier *sn; }; -SocksServer::SocksServer(TQObject *tqparent) -:TQObject(tqparent) +SocksServer::SocksServer(TQObject *parent) +:TQObject(parent) { d = new Private; d->sd = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index d61fef1a..14c2a176 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -61,8 +61,8 @@ public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; enum Method { AuthNone=0x0001, AuthUsername=0x0002 }; enum Request { ReqConnect, ReqUDPAssociate }; - SocksClient(TQObject *tqparent=0); - SocksClient(int, TQObject *tqparent=0); + SocksClient(TQObject *parent=0); + SocksClient(int, TQObject *parent=0); ~SocksClient(); bool isIncoming() const; @@ -132,7 +132,7 @@ class SocksServer : public TQObject Q_OBJECT TQ_OBJECT public: - SocksServer(TQObject *tqparent=0); + SocksServer(TQObject *parent=0); ~SocksServer(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 68f260ca..987de66c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -78,8 +78,8 @@ public: SafeDelete sd; }; -SrvResolver::SrvResolver(TQObject *tqparent) -:TQObject(tqparent) +SrvResolver::SrvResolver(TQObject *parent) +:TQObject(parent) { d = new Private; d->qdns = 0; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 5533790e..8ef15684 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -31,7 +31,7 @@ class SrvResolver : public TQObject Q_OBJECT TQ_OBJECT public: - SrvResolver(TQObject *tqparent=0); + SrvResolver(TQObject *parent=0); ~SrvResolver(); void resolve(const TQString &server, const TQString &type, const TQString &proto); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp index 76d4a799..e78c2f9a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index 5706fff6..b72fad78 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 2b9407ce..0c8b46df 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -27,8 +27,8 @@ #include<tqtextstream.h> -ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *tqparent, const char *name) -:TQDialog(tqparent, name, FALSE, WDestructiveClose) +ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name) +:TQDialog(parent, name, FALSE, WDestructiveClose) { TQString text; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index 408699f7..8c84be12 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -28,7 +28,7 @@ class ShowTextDlg : public TQDialog Q_OBJECT TQ_OBJECT public: - ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *tqparent=0, const char *name=0); + ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 3e52c5d2..8387d48a 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -498,11 +498,11 @@ namespace XMPP TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task(Client *, bool isRoot); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Client *client() const; TQDomDocument *doc() const; TQString id() const; @@ -546,7 +546,7 @@ namespace XMPP TQ_OBJECT public: - Client(TQObject *tqparent=0); + Client(TQObject *parent=0); ~Client(); bool isActive() const; diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h index a59a4827..ef5604a1 100644 --- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h +++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h @@ -65,7 +65,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -99,7 +99,7 @@ namespace XMPP TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream }; - AdvancedConnector(TQObject *tqparent=0); + AdvancedConnector(TQObject *parent=0); virtual ~AdvancedConnector(); class Proxy @@ -173,7 +173,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - TLSHandler(TQObject *tqparent=0); + TLSHandler(TQObject *parent=0); virtual ~TLSHandler(); virtual void reset()=0; @@ -194,7 +194,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - QCATLSHandler(QCA::TLS *tqparent); + QCATLSHandler(QCA::TLS *parent); ~QCATLSHandler(); QCA::TLS *tls() const; @@ -375,7 +375,7 @@ namespace XMPP SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual TQDomDocument & doc() const=0; @@ -456,8 +456,8 @@ namespace XMPP BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); - ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *tqparent=0); // server + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); + ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *parent=0); // server ~ClientStream(); Jid jid() const; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 2a9553a2..86bc65b0 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -67,8 +67,8 @@ public: bool sender; }; -FileTransfer::FileTransfer(FileTransferManager *m, TQObject *tqparent) -:TQObject(tqparent) +FileTransfer::FileTransfer(FileTransferManager *m, TQObject *parent) +:TQObject(parent) { d = new Private; d->m = m; @@ -450,8 +450,8 @@ public: TQStringList streamTypes; }; -JT_FT::JT_FT(Task *tqparent) -:Task(tqparent) +JT_FT::JT_FT(Task *parent) +:Task(parent) { d = new Private; } @@ -619,8 +619,8 @@ bool JT_FT::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushFT //---------------------------------------------------------------------------- -JT_PushFT::JT_PushFT(Task *tqparent) -:Task(tqparent) +JT_PushFT::JT_PushFT(Task *parent) +:Task(parent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h index 6ad8f7ff..f3688768 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h @@ -81,7 +81,7 @@ namespace XMPP void reset(); friend class FileTransferManager; - FileTransfer(FileTransferManager *, TQObject *tqparent=0); + FileTransfer(FileTransferManager *, TQObject *parent=0); void man_waitForAccept(const FTRequest &req); void takeConnection(S5BConnection *c); }; @@ -123,7 +123,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_FT(Task *tqparent); + JT_FT(Task *parent); ~JT_FT(); void request(const Jid &to, const TQString &id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes); @@ -154,7 +154,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushFT(Task *tqparent); + JT_PushFT(Task *parent); ~JT_PushFT(); void respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index 1914ad26..9e1f4ccd 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -185,8 +185,8 @@ public: static int id_conn = 0; static int num_conn = 0; -S5BConnection::S5BConnection(S5BManager *m, TQObject *tqparent) -:ByteStream(tqparent) +S5BConnection::S5BConnection(S5BManager *m, TQObject *parent) +:ByteStream(parent) { d = new Private; d->m = m; @@ -575,15 +575,15 @@ public: JT_PushS5B *ps; }; -S5BManager::S5BManager(Client *tqparent) -:TQObject(tqparent) +S5BManager::S5BManager(Client *parent) +:TQObject(parent) { // S5B needs SHA1 if(!QCA::isSupported(QCA::CAP_SHA1)) QCA::insertProvider(createProviderHash()); d = new Private; - d->client = tqparent; + d->client = parent; d->serv = 0; d->activeList.setAutoDelete(true); @@ -1865,8 +1865,8 @@ public: TQTimer t; }; -S5BConnector::S5BConnector(TQObject *tqparent) -:TQObject(tqparent) +S5BConnector::S5BConnector(TQObject *parent) +:TQObject(parent) { d = new Private; d->active = 0; @@ -2054,8 +2054,8 @@ public: TQPtrList<Item> itemList; }; -S5BServer::S5BServer(TQObject *tqparent) -:TQObject(tqparent) +S5BServer::S5BServer(TQObject *parent) +:TQObject(parent) { d = new Private; d->itemList.setAutoDelete(true); @@ -2195,8 +2195,8 @@ public: TQTimer t; }; -JT_S5B::JT_S5B(Task *tqparent) -:Task(tqparent) +JT_S5B::JT_S5B(Task *parent) +:Task(parent) { d = new Private; d->mode = -1; @@ -2356,8 +2356,8 @@ StreamHost JT_S5B::proxyInfo() const //---------------------------------------------------------------------------- // JT_PushS5B //---------------------------------------------------------------------------- -JT_PushS5B::JT_PushS5B(Task *tqparent) -:Task(tqparent) +JT_PushS5B::JT_PushS5B(Task *parent) +:Task(parent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h index d9818503..d925e25f 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h @@ -125,7 +125,7 @@ namespace XMPP void man_clientReady(SocksClient *, SocksUDP *); void man_udpReady(const TQByteArray &buf); void man_failed(int); - S5BConnection(S5BManager *, TQObject *tqparent=0); + S5BConnection(S5BManager *, TQObject *parent=0); }; class S5BManager : public TQObject @@ -203,7 +203,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - S5BConnector(TQObject *tqparent=0); + S5BConnector(TQObject *parent=0); ~S5BConnector(); void reset(); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index 6bf15aa2..2ca012c1 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp @@ -346,11 +346,11 @@ public: JT_IBB *ibb; }; -IBBManager::IBBManager(Client *tqparent) -:TQObject(tqparent) +IBBManager::IBBManager(Client *parent) +:TQObject(parent) { d = new Private; - d->client = tqparent; + d->client = parent; d->ibb = new JT_IBB(d->client->rootTask(), true); connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); @@ -479,8 +479,8 @@ public: TQString streamid; }; -JT_IBB::JT_IBB(Task *tqparent, bool serve) -:Task(tqparent) +JT_IBB::JT_IBB(Task *parent, bool serve) +:Task(parent) { d = new Private; d->serve = serve; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index ab2a5d5c..6e73799d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -55,8 +55,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // Connector //---------------------------------------------------------------------------- -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setUseSSL(false); setPeerAddressNone(); @@ -223,8 +223,8 @@ public: SafeDelete sd; }; -AdvancedConnector::AdvancedConnector(TQObject *tqparent) -:Connector(tqparent) +AdvancedConnector::AdvancedConnector(TQObject *parent) +:Connector(parent) { d = new Private; d->bs = 0; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index 59b28f8b..0e324cb1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -488,8 +488,8 @@ void Stanza::clearError() // Stream //---------------------------------------------------------------------------- static XmlProtocol *foo = 0; -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } @@ -612,8 +612,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) +:Stream(parent) { d = new Private; d->mode = Client; @@ -627,8 +627,8 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tq d->tlsHandler = tlsHandler; } -ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent) +:Stream(parent) { d = new Private; d->mode = Server; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 996727ea..313c6b6a 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp @@ -28,8 +28,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // TLSHandler //---------------------------------------------------------------------------- -TLSHandler::TLSHandler(TQObject *tqparent) -:TQObject(tqparent) +TLSHandler::TLSHandler(TQObject *parent) +:TQObject(parent) { } @@ -48,11 +48,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) -:TLSHandler(tqparent) +QCATLSHandler::QCATLSHandler(QCA::TLS *parent) +:TLSHandler(parent) { d = new Private; - d->tls = tqparent; + d->tls = parent; connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 91111ea9..d1650842 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -32,7 +32,7 @@ using namespace XMPP; // redundant namespaces. static TQDomElement stripExtraNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 7b425696..9d5ee471 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -34,7 +34,7 @@ //! Client, you will need to manually invoke Tasks. Fortunately, the //! process is very simple. //! -//! The entire Task system is heavily founded on TQt. All Tasks have a tqparent, +//! The entire Task system is heavily founded on TQt. All Tasks have a parent, //! except for the root Task, and are considered TQObjects. By using TQt's RTTI //! facilities (TQObject::sender(), TQObject::isA(), etc), you can use a //! "fire and forget" approach with Tasks. @@ -469,7 +469,7 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -1155,22 +1155,22 @@ public: bool done; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); - d->client = tqparent->client(); + d->client = parent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *tqparent, bool) +Task::Task(Client *parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -1189,9 +1189,9 @@ void Task::init() d->done = false; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Client *Task::client() const diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 522e52f9..9e742d10 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const } } if ( !d->xHTMLBody.isEmpty()) { - TQDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); + TQDomElement parent = s.createElement(s.xhtmlImNS(), "html"); for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { const TQString &str = it.data(); if(!str.isEmpty()) { TQDomElement child = s.createXHTMLElement(str); if(!it.key().isEmpty()) child.setAttributeNS(NS_XML, "xml:lang", it.key()); - tqparent.appendChild(child); + parent.appendChild(child); } } - s.appendChild(tqparent); + s.appendChild(parent); } if(d->type == "error") s.setError(d->error); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index 45ef7a04..4e4c96d1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -103,8 +103,8 @@ public: int type; }; -JT_Register::JT_Register(Task *tqparent) -:Task(tqparent) +JT_Register::JT_Register(Task *parent) +:Task(parent) { d = new Private; d->type = -1; @@ -246,8 +246,8 @@ public: JT_Register *jt_reg; }; -JT_UnRegister::JT_UnRegister(Task *tqparent) -: Task(tqparent) +JT_UnRegister::JT_UnRegister(Task *parent) +: Task(parent) { d = new Private; d->jt_reg = 0; @@ -306,8 +306,8 @@ public: TQValueList<TQDomElement> itemList; }; -JT_Roster::JT_Roster(Task *tqparent) -:Task(tqparent) +JT_Roster::JT_Roster(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushRoster //---------------------------------------------------------------------------- -JT_PushRoster::JT_PushRoster(Task *tqparent) -:Task(tqparent) +JT_PushRoster::JT_PushRoster(Task *parent) +:Task(parent) { } @@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Presence //---------------------------------------------------------------------------- -JT_Presence::JT_Presence(Task *tqparent) -:Task(tqparent) +JT_Presence::JT_Presence(Task *parent) +:Task(parent) { type = -1; } @@ -554,8 +554,8 @@ void JT_Presence::onGo() //---------------------------------------------------------------------------- // JT_PushPresence //---------------------------------------------------------------------------- -JT_PushPresence::JT_PushPresence(Task *tqparent) -:Task(tqparent) +JT_PushPresence::JT_PushPresence(Task *parent) +:Task(parent) { } @@ -653,7 +653,7 @@ bool JT_PushPresence::take(const TQDomElement &e) //---------------------------------------------------------------------------- static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest tqparent with a namespace + // find closest parent with a namespace TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) par = par.parentNode(); @@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e) return i; } -JT_Message::JT_Message(Task *tqparent, const Message &msg) -:Task(tqparent) +JT_Message::JT_Message(Task *parent, const Message &msg) +:Task(parent) { m = msg; m.setId(id()); @@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e) return i; } -JT_PushMessage::JT_PushMessage(Task *tqparent) -:Task(tqparent) +JT_PushMessage::JT_PushMessage(Task *parent) +:Task(parent) { } @@ -799,8 +799,8 @@ public: TQString message; }; -JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) -:Task(tqparent) +JT_GetLastActivity::JT_GetLastActivity(Task *parent) +:Task(parent) { d = new Private; } @@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- -JT_GetServices::JT_GetServices(Task *tqparent) -:Task(tqparent) +JT_GetServices::JT_GetServices(Task *parent) +:Task(parent) { } @@ -955,8 +955,8 @@ public: VCard vcard; }; -JT_VCard::JT_VCard(Task *tqparent) -:Task(tqparent) +JT_VCard::JT_VCard(Task *parent) +:Task(parent) { type = -1; d = new Private; @@ -1055,8 +1055,8 @@ public: TQValueList<SearchResult> resultList; }; -JT_Search::JT_Search(Task *tqparent) -:Task(tqparent) +JT_Search::JT_Search(Task *parent) +:Task(parent) { d = new Private; type = -1; @@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ClientVersion //---------------------------------------------------------------------------- -JT_ClientVersion::JT_ClientVersion(Task *tqparent) -:Task(tqparent) +JT_ClientVersion::JT_ClientVersion(Task *parent) +:Task(parent) { } @@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const //---------------------------------------------------------------------------- // JT_ClientTime //---------------------------------------------------------------------------- -/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j) -:Task(tqparent) +/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j) +:Task(parent) { j = _j; iq = createIQ("get", j.full(), id()); @@ -1307,8 +1307,8 @@ bool JT_ClientTime::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ServInfo //---------------------------------------------------------------------------- -JT_ServInfo::JT_ServInfo(Task *tqparent) -:Task(tqparent) +JT_ServInfo::JT_ServInfo(Task *parent) +:Task(parent) { } @@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Gateway //---------------------------------------------------------------------------- -JT_Gateway::JT_Gateway(Task *tqparent) -:Task(tqparent) +JT_Gateway::JT_Gateway(Task *parent) +:Task(parent) { type = -1; } @@ -1539,8 +1539,8 @@ public: AgentItem root; }; -JT_Browse::JT_Browse (Task *tqparent) -:Task (tqparent) +JT_Browse::JT_Browse (Task *parent) +:Task (parent) { d = new Private; } @@ -1664,8 +1664,8 @@ public: DiscoList items; }; -JT_DiscoItems::JT_DiscoItems(Task *tqparent) -: Task(tqparent) +JT_DiscoItems::JT_DiscoItems(Task *parent) +: Task(parent) { d = new Private; } @@ -1753,8 +1753,8 @@ public: DiscoItem item; }; -JT_DiscoInfo::JT_DiscoInfo(Task *tqparent) -: Task(tqparent) +JT_DiscoInfo::JT_DiscoInfo(Task *parent) +: Task(parent) { d = new Private; } @@ -1895,8 +1895,8 @@ public: DiscoList list; }; -JT_DiscoPublish::JT_DiscoPublish(Task *tqparent) -: Task(tqparent) +JT_DiscoPublish::JT_DiscoPublish(Task *parent) +: Task(parent) { d = new Private; } @@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_MucPresence //---------------------------------------------------------------------------- -JT_MucPresence::JT_MucPresence(Task *tqparent) -:Task(tqparent) +JT_MucPresence::JT_MucPresence(Task *parent) +:Task(parent) { type = -1; } @@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private int type; }; -JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) - :Task(tqparent) +JT_PrivateStorage::JT_PrivateStorage(Task *parent) + :Task(parent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h index 9d5125d9..97d68964 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -37,7 +37,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Register(Task *tqparent); + JT_Register(Task *parent); ~JT_Register(); void reg(const TQString &user, const TQString &pass); @@ -64,7 +64,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_UnRegister(Task *tqparent); + JT_UnRegister(Task *parent); ~JT_UnRegister(); void unreg(const Jid &); @@ -85,7 +85,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Roster(Task *tqparent); + JT_Roster(Task *parent); ~JT_Roster(); void get(); @@ -114,7 +114,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushRoster(Task *tqparent); + JT_PushRoster(Task *parent); ~JT_PushRoster(); bool take(const TQDomElement &); @@ -132,7 +132,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Presence(Task *tqparent); + JT_Presence(Task *parent); ~JT_Presence(); void pres(const tqStatus &); @@ -154,7 +154,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushPresence(Task *tqparent); + JT_PushPresence(Task *parent); ~JT_PushPresence(); bool take(const TQDomElement &); @@ -173,7 +173,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Message(Task *tqparent, const Message &); + JT_Message(Task *parent, const Message &); ~JT_Message(); void onGo(); @@ -190,7 +190,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PushMessage(Task *tqparent); + JT_PushMessage(Task *parent); ~JT_PushMessage(); bool take(const TQDomElement &); @@ -255,7 +255,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_VCard(Task *tqparent); + JT_VCard(Task *parent); ~JT_VCard(); void get(const Jid &); @@ -279,7 +279,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_Search(Task *tqparent); + JT_Search(Task *parent); ~JT_Search(); const Form & form() const; @@ -465,7 +465,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_MucPresence(Task *tqparent); + JT_MucPresence(Task *parent); ~JT_MucPresence(); void pres(const tqStatus &); @@ -486,7 +486,7 @@ namespace XMPP Q_OBJECT TQ_OBJECT public: - JT_PrivateStorage(Task *tqparent); + JT_PrivateStorage(Task *parent); ~JT_PrivateStorage(); void set(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp index ee51335f..1996b103 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp +++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp @@ -859,8 +859,8 @@ public: TQPtrList<QCA_CertContext> store; }; -TLS::TLS(TQObject *tqparent) -:TQObject(tqparent) +TLS::TLS(TQObject *parent) +:TQObject(parent) { d = new Private; } @@ -1127,8 +1127,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *tqparent) -:TQObject(tqparent) +SASL::SASL(TQObject *parent) +:TQObject(parent) { d = new Private; reset(); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h index dab99d5a..79b028bf 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.h +++ b/kopete/protocols/jabber/libiris/qca/src/qca.h @@ -333,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *tqparent=0); + TLS(TQObject *parent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -392,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *tqparent=0); + SASL(TQObject *parent=0); ~SASL(); static void setAppName(const TQString &name); diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index 22c228c7..d130fa97 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -30,7 +30,7 @@ #include "jabberformtranslator.h" #include "dlgjabberbrowse.h" -dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgBrowse (tqparent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgBrowse (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 85b67fb9..57549852 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -38,7 +38,7 @@ class dlgJabberBrowse:public dlgBrowse TQ_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberBrowse (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index ec7d1d10..948a594e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -30,8 +30,8 @@ #include "jabberaccount.h" #include "dlgchangepassword.h" -DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Change Jabber Password"), +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -116,7 +116,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () if ( task->success () ) { - KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Information, i18n ( "Your password has been changed successfully. Please note that the change may not be instantaneous. If you have problems logging in with your new password, please contact the administrator." ), i18n ( "Jabber Password Change" ) ); @@ -124,7 +124,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () } else { - KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(tqparent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast<TQWidget*>(parent()), KMessageBox::Sorry, i18n ( "Your password could not be changed. Either your server does not support this feature or the administrator does not allow you to change your password." ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index 2dd8d8dd..ffeed22b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~DlgJabberChangePassword(); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index e24815d5..9d69beae 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -27,8 +27,8 @@ #include "dlgjabberchatjoin.h" -dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent, const char* name) : -dlgChatJoin(tqparent, name), +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* parent, const char* name) : +dlgChatJoin(parent, name), m_account(account) { setCaption(i18n("Join Jabber Groupchat")); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index 6263fd32..1327ba47 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -28,7 +28,7 @@ class dlgJabberChatJoin : public dlgChatJoin TQ_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatJoin(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 838eb84f..1803a013 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -21,8 +21,8 @@ #include "dlgjabberchatroomslist.h" #include "jabberprotocol.h" -dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *tqparent, const char *name) : -dlgChatRoomsList(tqparent, name), +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *parent, const char *name) : +dlgChatRoomsList(parent, name), m_account(account) , m_selectedRow(-1) , m_nick(nick) { if (!server.isNull()) diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index 5bb8b4a9..f16802cc 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -24,7 +24,7 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList TQ_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* tqparent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* parent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 5f6b05a2..8d1324ca 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -26,7 +26,7 @@ #include "jabberclient.h" #include "dlgjabberregister.h" -dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgRegister (tqparent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgRegister (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 86100852..bc0bfe44 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -42,7 +42,7 @@ class dlgJabberRegister:public dlgRegister TQ_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index f16d927a..4b9192dc 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include "jabberclient.h" -dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *tqparent, const char *name ) - : DlgSendRaw (tqparent, name) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, const char *name ) + : DlgSendRaw (parent, name) { // Connect the GUI elements to things that do stuff connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 8a16f3e7..cafd9b94 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index e0e1a315..29b2b617 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -32,7 +32,7 @@ #include "dlgjabberservices.moc" -dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *tqparent, const char *name):dlgServices (tqparent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, const char *name):dlgServices (parent, name) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index 9672cc55..4ef09d9e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -37,7 +37,7 @@ class dlgJabberServices:public dlgServices TQ_OBJECT public: - dlgJabberServices (JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); ~dlgJabberServices (); private slots: @@ -62,8 +62,8 @@ class dlgJabberServies_item : protected TQObject, public TQListViewItem Q_OBJECT TQ_OBJECT public: - dlgJabberServies_item( TQListView *tqparent , const TQString &s1 , const TQString &s2 ) - : TQListViewItem(tqparent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} bool can_browse, can_register; XMPP::Jid jid; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index e4139786..2e81801d 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -56,12 +56,12 @@ #include "dlgvcard.h" /* - * Constructs a dlgJabberVCard which is a child of 'tqparent', with the + * Constructs a dlgJabberVCard which is a child of 'parent', with the * name 'name' * */ -dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent, const char *name) - : KDialogBase (tqparent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) +dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent, const char *name) + : KDialogBase (parent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) { m_account = account; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index 0ab95193..a20f2812 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -56,7 +56,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 0f86a79b..076b92b8 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -35,7 +35,7 @@ #include "jabberclient.h" #include "xmpp_tasks.h" -JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name) { (new TQVBoxLayout (this))->setAutoAdd (true); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index bb4e0271..f7c328c2 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -35,7 +35,7 @@ class JabberAddContactPage:public AddContactPage TQ_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); @@ -57,7 +57,7 @@ class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : p { Q_OBJECT TQ_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *tqparent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index b5fef8f3..95272833 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -30,12 +30,12 @@ #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" -JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Choose Jabber Server"), +JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Choose Jabber Server"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = tqparent; + mParentWidget = parent; mSelectedRow = -1; mMainWidget = new DlgJabberChooseServer ( this ); diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index bd74575d..aee2668e 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - JabberChooseServer ( JabberRegisterAccount *tqparent = 0, const char *name = 0); + JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); ~JabberChooseServer(); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 2b5ad749..758322cf 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "jabberregisteraccount.h" #include "dlgjabberchangepassword.h" -JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * tqparent, const char *name) - : DlgJabberEditAccountWidget (tqparent, name), KopeteEditAccountWidget (ident) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * parent, const char *name) + : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index e1ce2d30..82f56215 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * tqparent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); ~JabberEditAccountWidget (); virtual bool validateData (); virtual Kopete::Account *apply (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index cc7cd0fc..2641ed41 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -47,12 +47,12 @@ #include "jabberchooseserver.h" #include "dlgjabberregisteraccount.h" -JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name ) - : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"), +JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name ) + : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = tqparent; + mParentWidget = parent; // setup main dialog mMainWidget = new DlgJabberRegisterAccount ( this ); @@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent mSuccess = false; // get all settings from the main dialog - mMainWidget->leServer->setText ( tqparent->mServer->text () ); - mMainWidget->leJID->setText ( tqparent->mID->text () ); - mMainWidget->lePassword->setText ( tqparent->mPass->password () ); - // mMainWidget->lePasswordVerify->setText ( tqparent->mPass->password () ); //BUG 114631 - mMainWidget->sbPort->setValue ( tqparent->mPort->value () ); - mMainWidget->cbUseSSL->setChecked ( tqparent->cbUseSSL->isChecked () ); + mMainWidget->leServer->setText ( parent->mServer->text () ); + mMainWidget->leJID->setText ( parent->mID->text () ); + mMainWidget->lePassword->setText ( parent->mPass->password () ); + // mMainWidget->lePasswordVerify->setText ( parent->mPass->password () ); //BUG 114631 + mMainWidget->sbPort->setValue ( parent->mPort->value () ); + mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); @@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone () { mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) ); - // save settings to tqparent + // save settings to parent mParentWidget->mServer->setText ( mMainWidget->leServer->text () ); mParentWidget->mID->setText ( mMainWidget->leJID->text () ); mParentWidget->mPass->setPassword ( mMainWidget->lePassword->password () ); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 5d8b9b5f..74de6387 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - JabberRegisterAccount ( JabberEditAccountWidget *tqparent = 0, const char *name = 0 ); + JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); ~JabberRegisterAccount (); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index f96b10f8..805cba1b 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -35,17 +35,17 @@ #include <tqdict.h> MeanwhileAccount::MeanwhileAccount( - MeanwhileProtocol *tqparent, + MeanwhileProtocol *parent, const TQString &accountID, const char *name) - : Kopete::PasswordedAccount(tqparent, accountID, 0, name) + : Kopete::PasswordedAccount(parent, accountID, 0, name) { HERE; m_meanwhileId = accountID; m_session = 0L; setMyself(new MeanwhileContact(m_meanwhileId, m_meanwhileId, this, Kopete::ContactList::self()->myself())); - setOnlineStatus(tqparent->statusOffline); + setOnlineStatus(parent->statusOffline); infoPlugin = new MeanwhilePlugin(); } diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 7eb44fd2..57dca0c0 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -26,10 +26,10 @@ #include "meanwhileplugin.h" MeanwhileAddContactPage::MeanwhileAddContactPage( - TQWidget* tqparent, + TQWidget* parent, Kopete::Account *_account) - : AddContactPage(tqparent, 0L), theAccount(_account), - theParent(tqparent) + : AddContactPage(parent, 0L), theAccount(_account), + theParent(parent) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); theDialog = new MeanwhileAddContactBase(this); diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h index 4807b3e0..dadf6848 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h @@ -28,7 +28,7 @@ class MeanwhileAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - MeanwhileAddContactPage( TQWidget* tqparent = 0, + MeanwhileAddContactPage( TQWidget* parent = 0, Kopete::Account *account=0); ~MeanwhileAddContactPage(); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index 450bc8e4..e77d470a 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -30,8 +30,8 @@ #include "meanwhileplugin.h" MeanwhileContact::MeanwhileContact(TQString userId, TQString nickname, - MeanwhileAccount *account, Kopete::MetaContact *tqparent) - : Kopete::Contact(account, userId, tqparent) + MeanwhileAccount *account, Kopete::MetaContact *parent) + : Kopete::Contact(account, userId, parent) { setNickName(nickname); m_msgManager = 0L; diff --git a/kopete/protocols/meanwhile/meanwhilecontact.h b/kopete/protocols/meanwhile/meanwhilecontact.h index 28f49c2a..180ff0d3 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.h +++ b/kopete/protocols/meanwhile/meanwhilecontact.h @@ -35,7 +35,7 @@ class MeanwhileContact : public Kopete::Contact public: MeanwhileContact(TQString userId, TQString nickname, - MeanwhileAccount *account, Kopete::MetaContact *tqparent); + MeanwhileAccount *account, Kopete::MetaContact *parent); ~MeanwhileContact(); virtual bool isReachable(); diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index e1ef6100..58c70f68 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -64,10 +64,10 @@ void MeanwhileEditAccountWidget::selectClientListItem(int selectedID) } MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( - TQWidget* tqparent, + TQWidget* parent, Kopete::Account* theAccount, MeanwhileProtocol *theProtocol) - : MeanwhileEditAccountBase(tqparent), + : MeanwhileEditAccountBase(parent), KopeteEditAccountWidget( theAccount ) { protocol = theProtocol; diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h index a208b5f2..0f38bc4f 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h @@ -31,7 +31,7 @@ class MeanwhileEditAccountWidget : Q_OBJECT TQ_OBJECT public: - MeanwhileEditAccountWidget( TQWidget* tqparent, + MeanwhileEditAccountWidget( TQWidget* parent, Kopete::Account* account, MeanwhileProtocol *protocol); diff --git a/kopete/protocols/meanwhile/meanwhileplugin.cpp b/kopete/protocols/meanwhile/meanwhileplugin.cpp index 13a06b11..4ee995dd 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.cpp +++ b/kopete/protocols/meanwhile/meanwhileplugin.cpp @@ -18,7 +18,7 @@ #include <tqlineedit.h> #include "meanwhileplugin.h" -void MeanwhilePlugin::getMeanwhileId(TQWidget * /*tqparent*/, +void MeanwhilePlugin::getMeanwhileId(TQWidget * /*parent*/, TQLineEdit * /*fillThis*/) { } diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index 3c5c2768..072ffc08 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -29,7 +29,7 @@ public: * - like do lookups in company databases * when done fill 'fillThis' with the id of the contact */ - virtual void getMeanwhileId(TQWidget *tqparent,TQLineEdit *fillThis); + virtual void getMeanwhileId(TQWidget *parent,TQLineEdit *fillThis); /* can this plugin provide the above functionality */ virtual bool canProvideMeanwhileId(); diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp index b20eb48a..5f9b4ce7 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp +++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp @@ -29,9 +29,9 @@ typedef KGenericFactory<MeanwhileProtocol> MeanwhileProtocolFactory; K_EXPORT_COMPONENT_FACTORY(kopete_meanwhile, MeanwhileProtocolFactory("kopete_meanwhile")) -MeanwhileProtocol::MeanwhileProtocol(TQObject* tqparent, const char *name, +MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name, const TQStringList &/*args*/) -: Kopete::Protocol(MeanwhileProtocolFactory::instance(), tqparent, name), +: Kopete::Protocol(MeanwhileProtocolFactory::instance(), parent, name), statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString(), i18n("Offline"), i18n("Offline"), @@ -73,16 +73,16 @@ MeanwhileProtocol::~MeanwhileProtocol() { } -AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *tqparent, +AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account ) { - return new MeanwhileAddContactPage(tqparent, account); + return new MeanwhileAddContactPage(parent, account); } KopeteEditAccountWidget * MeanwhileProtocol::createEditAccountWidget( - Kopete::Account *account, TQWidget *tqparent ) + Kopete::Account *account, TQWidget *parent ) { - return new MeanwhileEditAccountWidget(tqparent, account, this); + return new MeanwhileEditAccountWidget(parent, account, this); } Kopete::Account *MeanwhileProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h index 98c8804a..dab52878 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.h +++ b/kopete/protocols/meanwhile/meanwhileprotocol.h @@ -40,16 +40,16 @@ class MeanwhileProtocol : public Kopete::Protocol Q_OBJECT TQ_OBJECT public: - MeanwhileProtocol(TQObject *tqparent, const char *name, + MeanwhileProtocol(TQObject *parent, const char *name, const TQStringList &args); ~MeanwhileProtocol(); - virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, + virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); virtual KopeteEditAccountWidget *createEditAccountWidget( - Kopete::Account *account, TQWidget *tqparent); + Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); diff --git a/kopete/protocols/msn/config/msnpreferences.cpp b/kopete/protocols/msn/config/msnpreferences.cpp index 6366e849..a6f5371f 100644 --- a/kopete/protocols/msn/config/msnpreferences.cpp +++ b/kopete/protocols/msn/config/msnpreferences.cpp @@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_msn, MSNProtocolConfigFactory( "kcm_kopet class MSNPreferences : public KCAutoConfigModule { public: - MSNPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), tqparent, args ) + MSNPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), parent, args ) { setMainWidget( new msnPrefsUI( this ) , "MSN"); } diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index acf9c8db..34aa7425 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -50,8 +50,8 @@ using P2P::OutgoingTransfer; #include <stdlib.h> -Dispatcher::Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip) - : TQObject(tqparent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) +Dispatcher::Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip) + : TQObject(parent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) {} Dispatcher::~Dispatcher() @@ -607,10 +607,10 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv Kopete::Contact* Dispatcher::getContactByAccountId(const TQString& accountId) { Kopete::Contact *contact = 0l; - if(tqparent()) + if(parent()) { // Retrieve the contact from the current chat session context. - Kopete::ChatSession *session = dynamic_cast<Kopete::ChatSession*>(tqparent()->tqparent()); + Kopete::ChatSession *session = dynamic_cast<Kopete::ChatSession*>(parent()->parent()); if(session) { contact = session->account()->contacts()[accountId]; @@ -636,7 +636,7 @@ TQ_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream) Dispatcher::CallbackChannel* Dispatcher::callbackChannel() { if(m_callbackChannel == 0l){ - MSNSwitchBoardSocket *callback = dynamic_cast<MSNSwitchBoardSocket *>(tqparent()); + MSNSwitchBoardSocket *callback = dynamic_cast<MSNSwitchBoardSocket *>(parent()); if(callback == 0l) return 0l; m_callbackChannel = new Dispatcher::CallbackChannel(callback); } diff --git a/kopete/protocols/msn/dispatcher.h b/kopete/protocols/msn/dispatcher.h index 690a7992..f7933ffc 100644 --- a/kopete/protocols/msn/dispatcher.h +++ b/kopete/protocols/msn/dispatcher.h @@ -42,7 +42,7 @@ namespace P2P{ { Q_OBJECT TQ_OBJECT public: - Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip); + Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip); ~Dispatcher(); void detach(TransferContext* transfer); diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp index f869d87e..40bd8877 100644 --- a/kopete/protocols/msn/messageformatter.cpp +++ b/kopete/protocols/msn/messageformatter.cpp @@ -26,7 +26,7 @@ using P2P::MessageFormatter; using P2P::Message; -MessageFormatter::MessageFormatter(TQObject *tqparent, const char *name) : TQObject(tqparent, name) +MessageFormatter::MessageFormatter(TQObject *parent, const char *name) : TQObject(parent, name) {} MessageFormatter::~MessageFormatter() diff --git a/kopete/protocols/msn/messageformatter.h b/kopete/protocols/msn/messageformatter.h index c5e7e77a..7fd050d7 100644 --- a/kopete/protocols/msn/messageformatter.h +++ b/kopete/protocols/msn/messageformatter.h @@ -30,7 +30,7 @@ namespace P2P{ { Q_OBJECT TQ_OBJECT public: - MessageFormatter(TQObject *tqparent = 0, const char *name = 0); + MessageFormatter(TQObject *parent = 0, const char *name = 0); ~MessageFormatter(); Message readMessage(const TQByteArray& stream, bool compact=false); diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index f99117bc..fbf43221 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -61,8 +61,8 @@ #include "avdevice/videodevicepool.h" #endif -MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const char *name ) - : Kopete::PasswordedAccount ( tqparent, AccountID.lower(), 0, name ) +MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name ) + : Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name ) { m_notifySocket = 0L; m_connectstatus = MSNProtocol::protocol()->NLN; diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h index f7c9b4e3..31ae451d 100644 --- a/kopete/protocols/msn/msnaccount.h +++ b/kopete/protocols/msn/msnaccount.h @@ -43,7 +43,7 @@ class MSNAccount : public Kopete::PasswordedAccount TQ_OBJECT public: - MSNAccount( MSNProtocol *tqparent, const TQString &accountID, const char *name = 0L ); + MSNAccount( MSNProtocol *parent, const TQString &accountID, const char *name = 0L ); /* * return the menu for this account diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp index 2442d627..8bdf77a1 100644 --- a/kopete/protocols/msn/msnaddcontactpage.cpp +++ b/kopete/protocols/msn/msnaddcontactpage.cpp @@ -25,8 +25,8 @@ #include "kopeteaccount.h" #include "kopeteuiglobal.h" -MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *tqparent, const char *name ) - : AddContactPage(tqparent,name) +MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *parent, const char *name ) + : AddContactPage(parent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); /* if ( connected ) diff --git a/kopete/protocols/msn/msnaddcontactpage.h b/kopete/protocols/msn/msnaddcontactpage.h index 5d1fa2f0..8e1f7694 100644 --- a/kopete/protocols/msn/msnaddcontactpage.h +++ b/kopete/protocols/msn/msnaddcontactpage.h @@ -17,7 +17,7 @@ class MSNAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - MSNAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0); + MSNAddContactPage(bool connected, TQWidget *parent=0, const char *name=0); ~MSNAddContactPage(); msnAddUI *msndata; TQLabel *noaddMsg1; diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 74c2bd63..2b7fe8bb 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -128,7 +128,7 @@ MSNChatSession::~MSNChatSession() { delete m_image; //force to disconnect the switchboard - //not needed since the m_chatService has us as tqparent + //not needed since the m_chatService has us as parent // if(m_chatService) // delete m_chatService; diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index cb4bfaa6..304029bf 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -50,8 +50,8 @@ #include "msnnotifysocket.h" #include "msnaccount.h" -MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ) -: Kopete::Contact( account, id, tqparent ) +MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ) +: Kopete::Contact( account, id, parent ) { m_deleted = false; m_allowed = false; @@ -75,7 +75,7 @@ MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::Me // wizard, and it can be because we are creating a temporary contact. // if it's added by the wizard, the status will be set immediately after. // if it's a temporary contact, better to set the unknown status. - setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); + setOnlineStatus( ( parent && parent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); actionBlock = 0L; diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h index 7ab36fc0..97039fed 100644 --- a/kopete/protocols/msn/msncontact.h +++ b/kopete/protocols/msn/msncontact.h @@ -47,7 +47,7 @@ class MSNContact : public Kopete::Contact TQ_OBJECT public: - MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ); + MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ); ~MSNContact(); /** diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp index a6790062..48c4050e 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.cpp +++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *tqparent ) -: KDialogBase( tqparent, 0L, true, +MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent ) +: KDialogBase( parent, 0L, true, i18n( "DEBUG: Send Raw Command - MSN Plugin" ), Ok | Cancel, Ok, true ) { diff --git a/kopete/protocols/msn/msndebugrawcmddlg.h b/kopete/protocols/msn/msndebugrawcmddlg.h index ee69f6c6..7ff50df7 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.h +++ b/kopete/protocols/msn/msndebugrawcmddlg.h @@ -35,7 +35,7 @@ class MSNDebugRawCmdDlg : public KDialogBase TQ_OBJECT public: - MSNDebugRawCmdDlg( TQWidget *tqparent ); + MSNDebugRawCmdDlg( TQWidget *parent ); ~MSNDebugRawCmdDlg(); TQString command(); diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index 31d16aeb..72b5f1f8 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -40,8 +40,8 @@ using namespace KNetwork; -MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* tqparent) - : MSNSocket(tqparent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) +MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* parent) + : MSNSocket(parent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) { m_handle=handle; m_kopeteTransfer=0l; diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h index a5a21f49..6dda5aa0 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.h +++ b/kopete/protocols/msn/msnfiletransfersocket.h @@ -43,7 +43,7 @@ class MSNFileTransferSocket : public MSNSocket , public MSNInvitation TQ_OBJECT public: - MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* tqparent = 0L ); + MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* parent = 0L ); ~MSNFileTransferSocket(); static TQString applicationID() { return "5D3E02AB-6190-11d3-BBBB-00C04F795683"; } diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 4337e9b2..26869ea7 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_ms MSNProtocol *MSNProtocol::s_protocol = 0L; -MSNProtocol::MSNProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( MSNProtocolFactory::instance(), tqparent, name ), +MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ), NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString(), i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ), BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", i18n( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", i18n( "Be Right Back" ), i18n( "Be &Right Back" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), @@ -111,14 +111,14 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta return c; } -AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *tqparent , Kopete::Account *i) +AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *parent , Kopete::Account *i) { - return (new MSNAddContactPage(i->isConnected(),tqparent)); + return (new MSNAddContactPage(i->isConnected(),parent)); } -KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new MSNEditAccountWidget(this,account,tqparent); + return new MSNEditAccountWidget(this,account,parent); } Kopete::Account *MSNProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h index 405baa95..4da1e6ad 100644 --- a/kopete/protocols/msn/msnprotocol.h +++ b/kopete/protocols/msn/msnprotocol.h @@ -59,7 +59,7 @@ class KOPETE_EXPORT MSNProtocol : public Kopete::Protocol TQ_OBJECT public: - MSNProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + MSNProtocol( TQObject *parent, const char *name, const TQStringList &args ); /** * SyncMode indicates whether settings differing between client and @@ -153,8 +153,8 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData ); - virtual AddContactPage *createAddContactWidget( TQWidget *tqparent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual AddContactPage *createAddContactWidget( TQWidget *parent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); static MSNProtocol* protocol(); diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 6dc8fa94..f238a507 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -54,7 +54,7 @@ class MimeMessage TQString message; }; -MSNSocket::MSNSocket(TQObject* tqparent) : TQObject (tqparent) +MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) { m_onlinetqStatus = Disconnected; m_socket = 0L; diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index c6dff087..e4238a59 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -50,7 +50,7 @@ class KOPETE_EXPORT MSNSocket : public TQObject TQ_OBJECT public: - MSNSocket(TQObject* tqparent=0l); + MSNSocket(TQObject* parent=0l); ~MSNSocket(); /** diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index f5cc890a..319df782 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -63,8 +63,8 @@ #include "dispatcher.h" using P2P::Dispatcher; -MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *tqparent ) -: MSNSocket( tqparent ) +MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *parent ) +: MSNSocket( parent ) { m_account = account; m_recvIcons=0; @@ -767,7 +767,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size)); - if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a tqparent somewere*/ , + if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ , i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) , i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" ) == KMessageBox::Continue ) @@ -1104,7 +1104,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( ) { /* This is a workaround against the bug 113425 - The problem: the P2P::Webcam class is tqparent of us, and when we get deleted, it get deleted. + The problem: the P2P::Webcam class is parent of us, and when we get deleted, it get deleted. the correct solution would be to change that. The second problem: after one minute of inactivity, the official client close the chat socket. the workaround: we simulate the activity by sending small packet each 50 seconds diff --git a/kopete/protocols/msn/msnswitchboardsocket.h b/kopete/protocols/msn/msnswitchboardsocket.h index df76eab0..f607a0a6 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.h +++ b/kopete/protocols/msn/msnswitchboardsocket.h @@ -49,7 +49,7 @@ public: /** * Contructor: id is the KopeteMessageMangager's id */ - MSNSwitchBoardSocket( MSNAccount * account , TQObject *tqparent); + MSNSwitchBoardSocket( MSNAccount * account , TQObject *parent); ~MSNSwitchBoardSocket(); private: diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 593cfc74..da0b856e 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -34,8 +34,8 @@ using namespace KNetwork; namespace PeerToPeer { -Transport::Transport(TQObject* tqparent, const char* name) - : TQObject(tqparent, name) +Transport::Transport(TQObject* parent, const char* name) + : TQObject(parent, name) { mFormatter = new PeerToPeer::MessageFormatter(this); } @@ -103,15 +103,15 @@ void Transport::slotOnReceive(const TQString& contact, const TQByteArray& bytes) -TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TQObject(tqparent, name) +TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) +: TQObject(parent, name) { mAddress = to; mFormatter = formatter; } -TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TQObject(tqparent, name) +TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) +: TQObject(parent, name) { mSocket = socket; mAddress = mSocket->peerAddress(); @@ -166,8 +166,8 @@ void TransportBridge::slotOnSocketReceive() -TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TransportBridge(to, formatter, tqparent, name) +TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) +: TransportBridge(to, formatter, parent, name) { mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this); mSocket->setBlocking(false); @@ -176,8 +176,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M mConnected = false; } -TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) -: TransportBridge(socket, formatter, tqparent, name) +TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) +: TransportBridge(socket, formatter, parent, name) { mConnected = (mSocket->state() == KStreamSocket::Open) ? true : false; mSocket->setBlocking(false); diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h index a606714b..9a7152fb 100644 --- a/kopete/protocols/msn/transport.h +++ b/kopete/protocols/msn/transport.h @@ -53,7 +53,7 @@ class Transport : public TQObject TQ_OBJECT public: /** @brief Creates a new instance of the class Transport. */ - Transport(TQObject* tqparent, const char* name = 0l); + Transport(TQObject* parent, const char* name = 0l); ~Transport(); /** @brief Get a transport bridge with the specified address, port, type and identifier. */ TransportBridge* getBridge(const TQString& address, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier); @@ -87,9 +87,9 @@ public: protected: /** @brief Creates a new instance of the class TransportBridge with the specified address and formatter. */ - TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); /** @brief Creates a new instance of the class TransportBridge with the specified socket and formatter. */ - TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); public: /** @brief Creates a connection between two peers. */ @@ -131,8 +131,8 @@ public: virtual ~TcpTransportBridge(); private: - TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); - TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); + TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); protected slots: virtual void slotOnConnect(); diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index aa16e07e..4bb246a2 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -65,8 +65,8 @@ public: TQImage pictureData; }; -MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ ) -: TQWidget( tqparent ), KopeteEditAccountWidget( account ) +MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent, const char * /* name */ ) +: TQWidget( parent ), KopeteEditAccountWidget( account ) { d = new MSNEditAccountWidgetPrivate; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h index 1d97b4f9..d52c52c9 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.h +++ b/kopete/protocols/msn/ui/msneditaccountwidget.h @@ -38,7 +38,7 @@ class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget TQ_OBJECT public: - MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0 ); + MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 ); ~MSNEditAccountWidget(); virtual bool validateData(); virtual Kopete::Account * apply(); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 584ae803..e2024a94 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -42,8 +42,8 @@ using namespace KNetwork; namespace P2P { -Webcam::Webcam(Who who, const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionId) - : TransferContext(to,tqparent,sessionId) , m_who(who) , m_timerId(0) +Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessionId) + : TransferContext(to,parent,sessionId) , m_who(who) , m_timerId(0) { setType(P2P::WebcamType); m_direction = Incoming; diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 59858d94..75e742d3 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -34,7 +34,7 @@ class Webcam : public TransferContext public: enum Who { wProducer , wViewer }; - Webcam( Who who , const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionID); + Webcam( Who who , const TQString& to, Dispatcher *parent, TQ_UINT32 sessionID); ~Webcam( ); virtual void processMessage(const Message& message); diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index e07aaebc..31e5dbfc 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -27,9 +27,9 @@ -MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * tqparent, const char * name ) +MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ), - KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ), + KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ), m_imageContainer( this ) { setInitialSize( TQSize(320,290), true ); diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.h b/kopete/protocols/msn/webcam/msnwebcamdialog.h index 292eb410..0bd415fe 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.h +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.h @@ -37,7 +37,7 @@ class KOPETE_EXPORT MSNWebcamDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MSNWebcamDialog( const TQString& contact, TQWidget* tqparent = 0, const char* name = 0 ); + MSNWebcamDialog( const TQString& contact, TQWidget* parent = 0, const char* name = 0 ); ~MSNWebcamDialog(); public slots: diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index cc890add..33a4b365 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -200,13 +200,13 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio } -AIMAccount::AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) - : OscarAccount(tqparent, accountID, name, false) +AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name) + : OscarAccount(parent, accountID, name, false) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; AIMMyselfContact* mc = new AIMMyselfContact( this ); setMyself( mc ); - myself()->setOnlineStatus( static_cast<AIMProtocol*>( tqparent )->statusOffline ); + myself()->setOnlineStatus( static_cast<AIMProtocol*>( parent )->statusOffline ); TQString profile = configGroup()->readEntry( "Profile", i18n( "Visit the Kopete website at <a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>") ); mc->setOwnProfile( profile ); @@ -597,13 +597,13 @@ void AIMAccount::disconnected( DisconnectReason reason ) void AIMAccount::messageReceived( const Oscar::Message& message ) { kdDebug(14152) << k_funcinfo << " Got a message, calling OscarAccount::messageReceived" << endl; - // Want to call the tqparent to do everything else + // Want to call the parent to do everything else if ( message.type() != 0x0003 ) { OscarAccount::messageReceived(message); // Check to see if our status is away, and send an away message - // Might be duplicate code from the tqparent class to get some needed information + // Might be duplicate code from the parent class to get some needed information // Perhaps a refactoring is needed. kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl; if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index fc3d57ff..fb18c69a 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -87,7 +87,7 @@ Q_OBJECT TQ_OBJECT public: - AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name=0L); + AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L); virtual ~AIMAccount(); // Accessor method for the action menu diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index c71fed4d..ffa81067 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -43,9 +43,9 @@ #include "aimcontact.h" #include "aimaccount.h" -AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* tqparent, +AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* parent, const TQString& icon, const Oscar::SSI& ssiItem ) -: OscarContact(account, name, tqparent, icon, ssiItem ) +: OscarContact(account, name, parent, icon, ssiItem ) { mProtocol=static_cast<AIMProtocol *>(protocol()); setOnlineStatus( mProtocol->statusOffline ); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 98a68361..2ccec9b2 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -27,8 +27,8 @@ #include "aimaccount.h" AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, - TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, modal, i18n( "Join AIM Chat Room" ), + TQWidget* parent, const char* name ) + : KDialogBase( parent, name, modal, i18n( "Join AIM Chat Room" ), Cancel | User1, User1, true, i18n( "Join" ) ) { diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h index 13dab708..13838fd1 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.h +++ b/kopete/protocols/oscar/aim/aimjoinchat.h @@ -32,7 +32,7 @@ class AIMJoinChatUI : public KDialogBase Q_OBJECT TQ_OBJECT public: - AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* tqparent = 0, + AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* parent = 0, const char* name = 0 ); ~AIMJoinChatUI(); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index b3d4205f..fe4dbf22 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -227,8 +227,8 @@ void AIMProtocolHandler::handleURL(const KURL &url) const -AIMProtocol::AIMProtocol(TQObject *tqparent, const char *name, const TQStringList &) - : Kopete::Protocol( AIMProtocolFactory::instance(), tqparent, name ), +AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &) + : Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ), statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, @@ -301,14 +301,14 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac return c; } -AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) +AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) { - return ( new AIMAddContactPage( account->isConnected(), tqparent ) ); + return ( new AIMAddContactPage( account->isConnected(), parent ) ); } -KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return ( new AIMEditAccountWidget( this, account, tqparent ) ); + return ( new AIMEditAccountWidget( this, account, parent ) ); } Kopete::Account *AIMProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h index e133ed97..a1e03983 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.h +++ b/kopete/protocols/oscar/aim/aimprotocol.h @@ -43,7 +43,7 @@ class AIMProtocol : public Kopete::Protocol TQ_OBJECT public: - AIMProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + AIMProtocol( TQObject *parent, const char *name, const TQStringList &args ); virtual ~AIMProtocol(); /** * Return the active instance of the protocol @@ -57,8 +57,8 @@ public: const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData ); - AddContactPage*createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); - KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); + AddContactPage*createAddContactWidget( TQWidget *parent, Kopete::Account *account ); + KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); Kopete::Account* createNewAccount( const TQString &accountId ); /** diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 767c519d..2ed71d94 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -37,8 +37,8 @@ #include <krun.h> AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *tqparent, const char* name ) - : KDialogBase( tqparent, name, modal, i18n( "User Information on %1" ) + TQWidget *parent, const char* name ) + : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h index 43f27b94..da2c261c 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.h +++ b/kopete/protocols/oscar/aim/aimuserinfo.h @@ -33,7 +33,7 @@ class AIMUserInfoDialog : public KDialogBase TQ_OBJECT public: AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *tqparent, const char* name); + TQWidget *parent, const char* name); ~AIMUserInfoDialog(); private: diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp index 7a2d1b1d..f00741c9 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp @@ -25,9 +25,9 @@ #include <klocale.h> #include <kmessagebox.h> -AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *tqparent, +AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent, const char *name ) - : AddContactPage(tqparent,name) + : AddContactPage(parent,name) { m_gui = 0; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h index e186ac61..c3cb1092 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h @@ -20,7 +20,7 @@ Q_OBJECT TQ_OBJECT public: - AIMAddContactPage(bool connected, TQWidget *tqparent=0, + AIMAddContactPage(bool connected, TQWidget *parent=0, const char *name=0); ~AIMAddContactPage(); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 5221130e..deaa2ff2 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -262,10 +262,10 @@ <cstring>edtServerAddress</cstring> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to.</string> + <string>The IP address or hostmask of the AIM server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> + <string>The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> </property> </widget> <widget class="TQLineEdit"> @@ -279,10 +279,10 @@ <string>login.oscar.aol.com</string> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to.</string> + <string>The IP address or hostmask of the AIM server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> + <string>The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com).</string> </property> </widget> <widget class="TQLabel"> diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 85e78ace..2e0100ab 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -20,8 +20,8 @@ #include "aimaccount.h" AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol, - Kopete::Account *account, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), KopeteEditAccountWidget( account ) + Kopete::Account *account, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), KopeteEditAccountWidget( account ) { //kdDebug(14152) << k_funcinfo << "Called." << endl; diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h index b3c4ad3a..dbf82adb 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h @@ -41,7 +41,7 @@ Q_OBJECT public: AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~AIMEditAccountWidget(); virtual bool validateData(); diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index b65f7e4e..ca53a294 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -74,8 +74,8 @@ void ICQMyselfContact::fetchShortInfo() static_cast<ICQAccount*>( account() )->engine()->requestShortInfo( contactId() ); } -ICQAccount::ICQAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) - : OscarAccount(tqparent, accountID, name, true) +ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char *name) + : OscarAccount(parent, accountID, name, true) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; setMyself( new ICQMyselfContact( this ) ); diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index e6a86819..a5335dbc 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -51,7 +51,7 @@ Q_OBJECT TQ_OBJECT public: - ICQAccount( Kopete::Protocol *tqparent, TQString accountID, const char *name = 0L ); + ICQAccount( Kopete::Protocol *parent, TQString accountID, const char *name = 0L ); virtual ~ICQAccount(); ICQProtocol *protocol(); diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 59979073..d5163db7 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -51,9 +51,9 @@ #include "oscarencodingselectiondialog.h" #include "ssimanager.h" -ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent, +ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent, const TQString& icon, const Oscar::SSI& ssiItem ) -: OscarContact( account, name, tqparent, icon, ssiItem ) +: OscarContact( account, name, parent, icon, ssiItem ) { mProtocol = static_cast<ICQProtocol *>(protocol()); m_infoWidget = 0L; diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index 59a87d4d..4c1d11e2 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -52,7 +52,7 @@ Q_OBJECT public: /** Normal ICQ constructor */ - ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent, + ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent, const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~ICQContact(); diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index a6888cee..dad58726 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -173,8 +173,8 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c ICQProtocol* ICQProtocol::protocolStatic_ = 0L; -ICQProtocol::ICQProtocol(TQObject *tqparent, const char *name, const TQStringList&) -: Kopete::Protocol( ICQProtocolFactory::instance(), tqparent, name ), +ICQProtocol::ICQProtocol(TQObject *parent, const char *name, const TQStringList&) +: Kopete::Protocol( ICQProtocolFactory::instance(), parent, name ), firstName(Kopete::Global::Properties::self()->firstName()), lastName(Kopete::Global::Properties::self()->lastName()), awayMessage(Kopete::Global::Properties::self()->awayMessage()), @@ -793,14 +793,14 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta return c; } -AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) +AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) { - return new ICQAddContactPage( static_cast<ICQAccount*>( account ), tqparent); + return new ICQAddContactPage( static_cast<ICQAccount*>( account ), parent); } -KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new ICQEditAccountWidget(this, account, tqparent); + return new ICQEditAccountWidget(this, account, parent); } Kopete::Account *ICQProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/icq/icqprotocol.h b/kopete/protocols/oscar/icq/icqprotocol.h index b614dd32..7af69b84 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.h +++ b/kopete/protocols/oscar/icq/icqprotocol.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - ICQProtocol(TQObject *tqparent, const char *name, const TQStringList &args); + ICQProtocol(TQObject *parent, const char *name, const TQStringList &args); virtual ~ICQProtocol(); /** @@ -54,8 +54,8 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData ); - AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account); - KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); + KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); Kopete::Account *createNewAccount(const TQString &accountId); ICQ::OnlineStatusManager *statusManager(); diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 7856df8a..94eaa063 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -29,8 +29,8 @@ #include <assert.h> -ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *tqparent, const char* name) - : KDialogBase(tqparent, name, false, TQString(), Close | User1, +ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) + : KDialogBase(parent, name, false, TQString(), Close | User1, Close, false, i18n("&Fetch Again")) { assert(c); diff --git a/kopete/protocols/oscar/icq/icqreadaway.h b/kopete/protocols/oscar/icq/icqreadaway.h index d489a202..a9a03c72 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.h +++ b/kopete/protocols/oscar/icq/icqreadaway.h @@ -31,7 +31,7 @@ class ICQReadAway : public KDialogBase TQ_OBJECT public: - ICQReadAway(ICQContact *, TQWidget *tqparent = 0, const char* name = "ICQReadAway"); + ICQReadAway(ICQContact *, TQWidget *parent = 0, const char* name = "ICQReadAway"); private slots: void slotFetchAwayMessage(); diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 84ce12e7..935b9853 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -39,8 +39,8 @@ #include "icqsearchdialog.h" -ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent, const char *name) - : AddContactPage(tqparent,name) +ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *parent, const char *name) + : AddContactPage(parent,name) { kdDebug(14153) << k_funcinfo << "called" << endl; mAccount = owner; diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index aebd4afa..1a901a0e 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent = 0, const char *name = 0); + ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0); ~ICQAddContactPage(); virtual bool validateData(); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index a2803f71..59b6ce82 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -24,8 +24,8 @@ #include <tqradiobutton.h> #include <tqlineedit.h> -ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *tqparent, const char *name, bool wasRequested ) - : KDialogBase( tqparent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) +ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool wasRequested ) + : KDialogBase( parent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) { m_ui = new ICQAuthReplyUI( this ); setMainWidget( m_ui ); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h index 9b801859..de11a442 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h @@ -31,7 +31,7 @@ class ICQAuthReplyDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ICQAuthReplyDialog(TQWidget *tqparent = 0, const char *name = 0, bool wasRequested = true); + ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true); ~ICQAuthReplyDialog(); void setUser( const TQString& user ); diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 8c8776e0..1bc5d379 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -248,10 +248,10 @@ If you do not currently have an ICQ account, please click the button to create o <string>login.icq.com</string> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the ICQ server you wish to connect to.</string> + <string>The IP address or hostmask of the ICQ server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string> + <string>The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string> </property> </widget> <widget class="TQLabel" row="1" column="1"> @@ -288,10 +288,10 @@ If you do not currently have an ICQ account, please click the button to create o <cstring>edtServerAddress</cstring> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the ICQ server you wish to connect to.</string> + <string>The IP address or hostmask of the ICQ server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string> + <string>The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com).</string> </property> </widget> <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4"> diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 3feb48bf..04a312a4 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -44,8 +44,8 @@ #include "icqcontact.h" ICQEditAccountWidget::ICQEditAccountWidget(ICQProtocol *protocol, - Kopete::Account *account, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), KopeteEditAccountWidget(account) + Kopete::Account *account, TQWidget *parent, const char *name) + : TQWidget(parent, name), KopeteEditAccountWidget(account) { kdDebug(14153) << k_funcinfo << "Called." << endl; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h index 2ef9e703..788cee4b 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h @@ -35,7 +35,7 @@ Q_OBJECT public: ICQEditAccountWidget(ICQProtocol *, Kopete::Account *, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual bool validateData(); virtual Kopete::Account *apply(); diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index aabf046d..f8b16198 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -41,8 +41,8 @@ #include "icqcontact.h" #include "icquserinfowidget.h" -ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n( "ICQ User Search" ), 0, NoDefault ) +ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* parent, const char* name ) +: KDialogBase( parent, name, true, i18n( "ICQ User Search" ), 0, NoDefault ) { m_account = account; m_searchUI = new ICQSearchBase( this, name ); @@ -171,10 +171,10 @@ void ICQSearchDialog::stopSearch() void ICQSearchDialog::addContact() { - ICQAddContactPage* iacp = dynamic_cast<ICQAddContactPage*>( tqparent() ); + ICQAddContactPage* iacp = dynamic_cast<ICQAddContactPage*>( parent() ); if ( !iacp ) { - kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our tqparent!!" << endl; + kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our parent!!" << endl; } else { diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h index f9bfa81e..e437ce63 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h @@ -34,7 +34,7 @@ class ICQSearchDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ICQSearchDialog( ICQAccount* account, TQWidget* tqparent = 0, const char* name = 0 ); + ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 ); ~ICQSearchDialog(); private slots: diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 5c1d4500..1eb1c934 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -40,8 +40,8 @@ #include "icqinterestinfowidget.h" -ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * tqparent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "ICQ User Information" ), Ok ) +ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "ICQ User Information" ), Ok ) { kdDebug(14153) << k_funcinfo << "Creating new icq user info widget" << endl; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h index 16d1d5d9..e8c5c54f 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h @@ -34,7 +34,7 @@ class ICQUserInfoWidget : public KDialogBase Q_OBJECT TQ_OBJECT public: - ICQUserInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 ); void setContact( ICQContact* contact ); public slots: diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 74b6b5f9..9c669dcd 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -AimLoginTask::AimLoginTask( Task* tqparent ) - : Task ( tqparent ) +AimLoginTask::AimLoginTask( Task* parent ) + : Task ( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h index 11761ad5..af907e6a 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.h +++ b/kopete/protocols/oscar/liboscar/aimlogintask.h @@ -28,7 +28,7 @@ class AimLoginTask : public Task Q_OBJECT TQ_OBJECT public: - AimLoginTask( Task* tqparent ); + AimLoginTask( Task* parent ); ~AimLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp index b61c5cdd..8550c408 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp @@ -23,8 +23,8 @@ #include "oscartypes.h" #include "oscarutils.h" -BLMLimitsTask::BLMLimitsTask( Task* tqparent ) - : Task( tqparent ) +BLMLimitsTask::BLMLimitsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.h b/kopete/protocols/oscar/liboscar/blmlimitstask.h index 49fa11d0..7ded03a7 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.h +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.h @@ -28,7 +28,7 @@ Fetch the limits for the BLM service class BLMLimitsTask : public Task { public: - BLMLimitsTask( Task* tqparent ); + BLMLimitsTask( Task* parent ); ~BLMLimitsTask(); diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp index 1feccdc4..c75a592b 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp +++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp @@ -27,8 +27,8 @@ #include "oscarutils.h" #include <typeinfo> -BuddyIconTask::BuddyIconTask( Task* tqparent ) - :Task( tqparent ) +BuddyIconTask::BuddyIconTask( Task* parent ) + :Task( parent ) { m_seq = 0; m_refNum = -1; diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h index 2eb5294a..d19e0ab6 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.h +++ b/kopete/protocols/oscar/liboscar/buddyicontask.h @@ -30,7 +30,7 @@ class BuddyIconTask : public Task Q_OBJECT TQ_OBJECT public: - BuddyIconTask( Task* tqparent ); + BuddyIconTask( Task* parent ); void uploadIcon( WORD length, const TQByteArray& data ); void setReferenceNum( WORD num ); diff --git a/kopete/protocols/oscar/liboscar/bytestream.cpp b/kopete/protocols/oscar/liboscar/bytestream.cpp index f2fb8e51..87603c76 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.cpp +++ b/kopete/protocols/oscar/liboscar/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { d = new Private; } diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h index c4dc96e1..9104bbce 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.h +++ b/kopete/protocols/oscar/liboscar/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp index 23231179..8830243a 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp @@ -30,7 +30,7 @@ #include "transfer.h" -ChangeVisibilityTask::ChangeVisibilityTask(Task* tqparent): Task(tqparent) +ChangeVisibilityTask::ChangeVisibilityTask(Task* parent): Task(parent) { m_sequence = 0; m_visible = true; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h index 33d0c306..0ec5ab04 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h @@ -30,7 +30,7 @@ class ChangeVisibilityTask : public Task { public: - ChangeVisibilityTask( Task* tqparent ); + ChangeVisibilityTask( Task* parent ); ~ChangeVisibilityTask(); void setVisible( bool visible = true ); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 350c58d1..23136db4 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -25,7 +25,7 @@ #include "connection.h" -ChatNavServiceTask::ChatNavServiceTask( Task* tqparent ) : Task( tqparent ) +ChatNavServiceTask::ChatNavServiceTask( Task* parent ) : Task( parent ) { m_type = Limits; } diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h index 4c417e3b..a36e2ab4 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h @@ -32,7 +32,7 @@ class ChatNavServiceTask : public Task Q_OBJECT TQ_OBJECT public: - ChatNavServiceTask( Task* tqparent ); + ChatNavServiceTask( Task* parent ); ~ChatNavServiceTask(); enum RequestType { Limits = 0x0002, Exchange, Room, ExtRoom, Members, diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp index 8d9c55e8..ff3159f4 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp @@ -30,8 +30,8 @@ #include "buffer.h" #include "oscartypes.h" -ChatServiceTask::ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ) - : Task( tqparent ), m_encoding( "us-ascii" ) +ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ) + : Task( parent ), m_encoding( "us-ascii" ) { m_exchange = exchange; m_room = room; diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h index d9805068..8cc09b9f 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatservicetask.h @@ -30,7 +30,7 @@ class ChatServiceTask : public Task Q_OBJECT TQ_OBJECT public: - ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ); + ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ); ~ChatServiceTask(); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 41ee73bd..00431434 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -137,8 +137,8 @@ public: const Oscar::ClientVersion* version; }; -Client::Client( TQObject* tqparent ) -:TQObject( tqparent, "oscarclient" ) +Client::Client( TQObject* parent ) +:TQObject( parent, "oscarclient" ) { m_loginTask = 0L; m_loginTaskTwo = 0L; diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index 5e9cc61b..976f43be 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -75,7 +75,7 @@ public: EXTERNAL API *************/ - Client(TQObject *tqparent=0); + Client(TQObject *parent=0); ~Client(); /** diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.cpp b/kopete/protocols/oscar/liboscar/clientreadytask.cpp index 0f324f1a..3025a0d8 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.cpp +++ b/kopete/protocols/oscar/liboscar/clientreadytask.cpp @@ -28,7 +28,7 @@ using namespace Oscar; -ClientReadyTask::ClientReadyTask(Task* tqparent): Task(tqparent) +ClientReadyTask::ClientReadyTask(Task* parent): Task(parent) { m_classList = client()->rateManager()->classList(); } diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.h b/kopete/protocols/oscar/liboscar/clientreadytask.h index ac570895..d632351f 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.h +++ b/kopete/protocols/oscar/liboscar/clientreadytask.h @@ -30,7 +30,7 @@ Fire and forget task to let the server know we're ready class ClientReadyTask : public Task { public: - ClientReadyTask( Task* tqparent ); + ClientReadyTask( Task* parent ); ~ClientReadyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index 4a09f3f9..3b062b2a 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -CloseConnectionTask::CloseConnectionTask( Task* tqparent ) - : Task(tqparent) +CloseConnectionTask::CloseConnectionTask( Task* parent ) + : Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h index 27830b31..c3001ba7 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h @@ -31,7 +31,7 @@ class TQString; class CloseConnectionTask : public Task { public: - CloseConnectionTask(Task* tqparent); + CloseConnectionTask(Task* parent); ~CloseConnectionTask(); diff --git a/kopete/protocols/oscar/liboscar/connector.cpp b/kopete/protocols/oscar/liboscar/connector.cpp index fff59980..6f71c805 100644 --- a/kopete/protocols/oscar/liboscar/connector.cpp +++ b/kopete/protocols/oscar/liboscar/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setPeerAddressNone(); } diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h index d1d96e4d..ee5d3e32 100644 --- a/kopete/protocols/oscar/liboscar/connector.h +++ b/kopete/protocols/oscar/liboscar/connector.h @@ -32,7 +32,7 @@ class Connector : public TQObject Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; diff --git a/kopete/protocols/oscar/liboscar/errortask.cpp b/kopete/protocols/oscar/liboscar/errortask.cpp index 3620addb..9e9ce95b 100644 --- a/kopete/protocols/oscar/liboscar/errortask.cpp +++ b/kopete/protocols/oscar/liboscar/errortask.cpp @@ -20,8 +20,8 @@ #include "oscartypes.h" #include "transfer.h" -ErrorTask::ErrorTask( Task* tqparent ) - : Task( tqparent ) +ErrorTask::ErrorTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/errortask.h b/kopete/protocols/oscar/liboscar/errortask.h index 1199eb92..f74152db 100644 --- a/kopete/protocols/oscar/liboscar/errortask.h +++ b/kopete/protocols/oscar/liboscar/errortask.h @@ -27,7 +27,7 @@ Handles OSCAR protocol errors received from the server on snac subtype 0x01 class ErrorTask : public Task { public: - ErrorTask( Task* tqparent ); + ErrorTask( Task* parent ); ~ErrorTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.cpp b/kopete/protocols/oscar/liboscar/flapprotocol.cpp index eaa12166..aef08f9a 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/flapprotocol.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -FlapProtocol::FlapProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +FlapProtocol::FlapProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h index 2574df50..0771197a 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.h +++ b/kopete/protocols/oscar/liboscar/flapprotocol.h @@ -30,7 +30,7 @@ class FlapProtocol : public InputProtocolBase Q_OBJECT TQ_OBJECT public: - FlapProtocol( TQObject *tqparent = 0, const char *name = 0 ); + FlapProtocol( TQObject *parent = 0, const char *name = 0 ); ~FlapProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp index 0aee0f98..ec3ad9da 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp @@ -24,8 +24,8 @@ #include "oscarutils.h" #include "buffer.h" -ICBMParamsTask::ICBMParamsTask( Task* tqparent ) - : Task( tqparent ) +ICBMParamsTask::ICBMParamsTask( Task* parent ) + : Task( parent ) {} diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.h b/kopete/protocols/oscar/liboscar/icbmparamstask.h index b3091fa8..c7bdfb16 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.h +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.h @@ -28,7 +28,7 @@ Get the parameters we need to follow for instant messages class ICBMParamsTask : public Task { public: - ICBMParamsTask( Task* tqparent ); + ICBMParamsTask( Task* parent ); ~ICBMParamsTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.cpp b/kopete/protocols/oscar/liboscar/icqlogintask.cpp index 9bc58452..74958156 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/icqlogintask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -IcqLoginTask::IcqLoginTask( Task* tqparent ) - : Task( tqparent ) +IcqLoginTask::IcqLoginTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h index e13b1f99..3111608d 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.h +++ b/kopete/protocols/oscar/liboscar/icqlogintask.h @@ -32,7 +32,7 @@ class IcqLoginTask : public Task Q_OBJECT TQ_OBJECT public: - IcqLoginTask( Task* tqparent ); + IcqLoginTask( Task* parent ); ~IcqLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp index 1c8d98ae..bb58a9c4 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.cpp +++ b/kopete/protocols/oscar/liboscar/icqtask.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> -ICQTask::ICQTask( Task * tqparent ) - : Task( tqparent ) +ICQTask::ICQTask( Task * parent ) + : Task( parent ) { m_icquin = client()->userId().toULong(); m_sequence = 0; diff --git a/kopete/protocols/oscar/liboscar/icqtask.h b/kopete/protocols/oscar/liboscar/icqtask.h index 9397163a..00ef13fb 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.h +++ b/kopete/protocols/oscar/liboscar/icqtask.h @@ -30,7 +30,7 @@ class ICQTask : public Task Q_OBJECT TQ_OBJECT public: - ICQTask( Task* tqparent ); + ICQTask( Task* parent ); ~ICQTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp index 6e8dd5d7..3635bc71 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp @@ -23,7 +23,7 @@ #include "buffer.h" -ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* tqparent ) : ICQTask( tqparent ) +ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* parent ) : ICQTask( parent ) { //by default, request short info. it saves bandwidth m_type = Short; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h index 437ac4ca..cd157f4d 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.h +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h @@ -35,7 +35,7 @@ class ICQUserInfoRequestTask : public ICQTask Q_OBJECT TQ_OBJECT public: - ICQUserInfoRequestTask( Task* tqparent ); + ICQUserInfoRequestTask( Task* parent ); ~ICQUserInfoRequestTask(); enum { Long = 0, Short }; diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp index 2054ace7..4b27166b 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp @@ -18,8 +18,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) + : TQObject(parent, name) { m_state = NeedMore; m_bytes = 0; diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h index bf2235ef..365927cc 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); + InputProtocolBase(TQObject *parent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.cpp b/kopete/protocols/oscar/liboscar/locationrightstask.cpp index dec65031..d1e4b595 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.cpp +++ b/kopete/protocols/oscar/liboscar/locationrightstask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -LocationRightsTask::LocationRightsTask( Task* tqparent ) - : Task( tqparent ) +LocationRightsTask::LocationRightsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.h b/kopete/protocols/oscar/liboscar/locationrightstask.h index cbc17e10..a3e82767 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.h +++ b/kopete/protocols/oscar/liboscar/locationrightstask.h @@ -36,7 +36,7 @@ This task implements the following SNACS: class LocationRightsTask : public Task { public: - LocationRightsTask( Task* tqparent ); + LocationRightsTask( Task* parent ); ~LocationRightsTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index 10d62e6d..f7b55531 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -37,8 +37,8 @@ * Stage One Task Implementation */ -StageOneLoginTask::StageOneLoginTask( Task* tqparent ) - : Task ( tqparent ) +StageOneLoginTask::StageOneLoginTask( Task* parent ) + : Task ( parent ) { m_aimTask = 0L; m_icqTask = 0L; @@ -137,8 +137,8 @@ const TQString& StageOneLoginTask::bosPort() const /** * Stage Two Task Implementation */ -StageTwoLoginTask::StageTwoLoginTask( Task* tqparent ) - : Task( tqparent ) +StageTwoLoginTask::StageTwoLoginTask( Task* parent ) + : Task( parent ) { //Create our tasks Task* rootTask = client()->rootTask(); diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h index 6a61dc9f..c9bf27dc 100644 --- a/kopete/protocols/oscar/liboscar/logintask.h +++ b/kopete/protocols/oscar/liboscar/logintask.h @@ -46,7 +46,7 @@ class StageOneLoginTask : public Task Q_OBJECT TQ_OBJECT public: - StageOneLoginTask( Task* tqparent ); + StageOneLoginTask( Task* parent ); ~StageOneLoginTask(); bool take( Transfer* transfer ); @@ -106,7 +106,7 @@ class StageTwoLoginTask : public Task Q_OBJECT TQ_OBJECT public: - StageTwoLoginTask( Task* tqparent ); + StageTwoLoginTask( Task* parent ); ~StageTwoLoginTask(); bool take( Transfer* transfer ); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp index bf8e2350..1bbe6622 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp @@ -25,7 +25,7 @@ #include "userdetails.h" -MessageReceiverTask::MessageReceiverTask( Task* tqparent ) : Task( tqparent ) +MessageReceiverTask::MessageReceiverTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h index 55df700a..c288a82d 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.h +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - MessageReceiverTask( Task* tqparent ); + MessageReceiverTask( Task* parent ); ~MessageReceiverTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp index 2fc70b45..88d41a84 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp @@ -26,8 +26,8 @@ #include <kdebug.h> -OfflineMessagesTask::OfflineMessagesTask( Task* tqparent ) - : ICQTask( tqparent ) +OfflineMessagesTask::OfflineMessagesTask( Task* parent ) + : ICQTask( parent ) { tzset(); m_sequence = 0; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.h b/kopete/protocols/oscar/liboscar/offlinemessagestask.h index 3433d762..87a7a9dc 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.h +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.h @@ -32,7 +32,7 @@ class OfflineMessagesTask : public ICQTask Q_OBJECT TQ_OBJECT public: - OfflineMessagesTask( Task* tqparent ); + OfflineMessagesTask( Task* parent ); ~OfflineMessagesTask(); diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp index c3419740..6b6b3d05 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> -OnlineNotifierTask::OnlineNotifierTask( Task* tqparent ) : Task( tqparent ) +OnlineNotifierTask::OnlineNotifierTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h index bc200611..08730c70 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h @@ -37,7 +37,7 @@ class OnlineNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - OnlineNotifierTask( Task* tqparent ); + OnlineNotifierTask( Task* parent ); ~OnlineNotifierTask(); diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index 9c12d473..c3a39253 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -24,8 +24,8 @@ #include "oscarbytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *tqparent, const char */*name*/ ) - : ByteStream ( tqparent ) +KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) + : ByteStream ( parent ) { kdDebug( 14151 ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index bf11446b..db5c3a3b 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 3c2edeaf..22c68df6 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -104,8 +104,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *tqparent) -:Stream(tqparent) +ClientStream::ClientStream(Connector *conn, TQObject *parent) +:Stream(parent) { //qDebug("CLIENTSTREAM::ClientStream"); diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h index f5ab752d..6d4f2026 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.h +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h @@ -74,7 +74,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TQObject *tqparent=0); + ClientStream(Connector *conn, TQObject *parent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 9f33eb76..98d56237 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -24,8 +24,8 @@ #include "oscarconnector.h" #include "oscarbytestream.h" -KNetworkConnector::KNetworkConnector( TQObject *tqparent, const char */*name*/ ) - : Connector( tqparent ) +KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) + : Connector( parent ) { kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl; diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h index 9441c3c6..3e72a8dc 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.h +++ b/kopete/protocols/oscar/liboscar/oscarconnector.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkConnector( TQObject *tqparent = 0, const char *name = 0 ); + KNetworkConnector( TQObject *parent = 0, const char *name = 0 ); virtual ~KNetworkConnector(); diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp index 7731aa51..59ec1b7a 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp @@ -29,7 +29,7 @@ using namespace Oscar; -OwnUserInfoTask::OwnUserInfoTask( Task* tqparent ) : Task( tqparent ) +OwnUserInfoTask::OwnUserInfoTask( Task* parent ) : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h index 6b162d00..c5c77d2f 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h @@ -31,7 +31,7 @@ class OwnUserInfoTask : public Task Q_OBJECT TQ_OBJECT public: - OwnUserInfoTask( Task* tqparent ); + OwnUserInfoTask( Task* parent ); ~OwnUserInfoTask(); diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.cpp b/kopete/protocols/oscar/liboscar/prmparamstask.cpp index cd4cfddc..cc4416be 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/prmparamstask.cpp @@ -24,8 +24,8 @@ using namespace Oscar; -PRMParamsTask::PRMParamsTask( Task* tqparent ) - : Task( tqparent ) +PRMParamsTask::PRMParamsTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.h b/kopete/protocols/oscar/liboscar/prmparamstask.h index fe0f25c0..eebfdc61 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.h +++ b/kopete/protocols/oscar/liboscar/prmparamstask.h @@ -28,7 +28,7 @@ class Transfer; class PRMParamsTask : public Task { public: - PRMParamsTask( Task* tqparent ); + PRMParamsTask( Task* parent ); ~PRMParamsTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/profiletask.cpp b/kopete/protocols/oscar/liboscar/profiletask.cpp index 09a8b3a0..1544a5b4 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.cpp +++ b/kopete/protocols/oscar/liboscar/profiletask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -ProfileTask::ProfileTask( Task* tqparent ) - : Task( tqparent ) +ProfileTask::ProfileTask( Task* parent ) + : Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/profiletask.h b/kopete/protocols/oscar/liboscar/profiletask.h index d16a05de..a51075a5 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.h +++ b/kopete/protocols/oscar/liboscar/profiletask.h @@ -32,7 +32,7 @@ The away message will be set only if the away message has been set non-null. class ProfileTask : public Task { public: - ProfileTask( Task* tqparent ); + ProfileTask( Task* parent ); ~ProfileTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp index 6d050643..d035c810 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.cpp +++ b/kopete/protocols/oscar/liboscar/rateclass.cpp @@ -22,8 +22,8 @@ using namespace Oscar; -RateClass::RateClass( TQObject* tqparent ) -: TQObject( tqparent, 0 ) +RateClass::RateClass( TQObject* parent ) +: TQObject( parent, 0 ) { m_waitingToSend = false; m_packetTimer.start(); diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h index 122bde8d..d981dd83 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.h +++ b/kopete/protocols/oscar/liboscar/rateclass.h @@ -39,7 +39,7 @@ class RateClass : public TQObject Q_OBJECT TQ_OBJECT public: - RateClass( TQObject* tqparent = 0 ); + RateClass( TQObject* parent = 0 ); ~RateClass(); /** Accessor for classid */ diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp index 0b14c9ec..59ef735e 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp @@ -34,11 +34,11 @@ public: Connection* client; }; -RateClassManager::RateClassManager( Connection* tqparent, const char* name ) -: TQObject( tqparent, name ) +RateClassManager::RateClassManager( Connection* parent, const char* name ) +: TQObject( parent, name ) { d = new RateClassManagerPrivate(); - d->client = tqparent; + d->client = parent; } RateClassManager::~RateClassManager() diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h index fe2a8433..14155029 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.h +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h @@ -36,7 +36,7 @@ class RateClassManager : public TQObject Q_OBJECT TQ_OBJECT public: - RateClassManager( Connection* tqparent, const char* name = 0 ); + RateClassManager( Connection* parent, const char* name = 0 ); ~RateClassManager(); /** Reset the rate manager */ diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp index a7249a74..48fff142 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -RateInfoTask::RateInfoTask( Task* tqparent ) - : Task( tqparent ) +RateInfoTask::RateInfoTask( Task* parent ) + : Task( parent ) { connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) ); } diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h index 407e91b4..1ca3174f 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.h +++ b/kopete/protocols/oscar/liboscar/rateinfotask.h @@ -32,7 +32,7 @@ class RateInfoTask : public Task Q_OBJECT TQ_OBJECT public: - RateInfoTask( Task* tqparent ); + RateInfoTask( Task* parent ); ~RateInfoTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp index 02dd0ba6..3bd07cb5 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp @@ -25,7 +25,7 @@ #include "oscarutils.h" #include "transfer.h" -SendDCInfoTask::SendDCInfoTask(Task* tqparent, DWORD status): Task(tqparent), mtqStatus(status) +SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status) { } diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h index e967cb18..a98b9612 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.h +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h @@ -28,7 +28,7 @@ Fire and forget task that sends our direct connection info class SendDCInfoTask : public Task { public: - SendDCInfoTask( Task* tqparent, DWORD status ); + SendDCInfoTask( Task* parent, DWORD status ); ~SendDCInfoTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp index a4bc61e2..63816a63 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp @@ -23,7 +23,7 @@ #include "oscarutils.h" #include "transfer.h" -SendIdleTimeTask::SendIdleTimeTask( Task* tqparent ) : Task( tqparent ) +SendIdleTimeTask::SendIdleTimeTask( Task* parent ) : Task( parent ) { m_idleTime = 0; } diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.h b/kopete/protocols/oscar/liboscar/sendidletimetask.h index 4ba9e588..beba74c2 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.h +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.h @@ -29,7 +29,7 @@ Sends the idle time to the server class SendIdleTimeTask : public Task { public: - SendIdleTimeTask( Task* tqparent ); + SendIdleTimeTask( Task* parent ); ~SendIdleTimeTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index b3a4a36e..596e6791 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" -SendMessageTask::SendMessageTask(Task* tqparent): Task(tqparent) +SendMessageTask::SendMessageTask(Task* parent): Task(parent) { m_autoResponse = false; m_cookieCount = 0x7FFF; diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.h b/kopete/protocols/oscar/liboscar/sendmessagetask.h index a6a0e598..18e03c73 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.h +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.h @@ -26,7 +26,7 @@ class SendMessageTask : public Task { public: - SendMessageTask( Task* tqparent ); + SendMessageTask( Task* parent ); ~SendMessageTask(); //! Set the message to be sent diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp index 4e3ffa86..b1de8c4b 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp @@ -25,8 +25,8 @@ #include "connection.h" #include "transfer.h" -ServerRedirectTask::ServerRedirectTask( Task* tqparent ) - :Task( tqparent ), m_service( 0 ) +ServerRedirectTask::ServerRedirectTask( Task* parent ) + :Task( parent ), m_service( 0 ) { } diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h index 936ff582..b43fe195 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.h +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h @@ -34,7 +34,7 @@ class ServerRedirectTask : public Task Q_OBJECT TQ_OBJECT public: - ServerRedirectTask( Task* tqparent ); + ServerRedirectTask( Task* parent ); void setService( WORD family ); void setChatParams( WORD exchange, TQByteArray cookie, WORD instance ); diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.cpp b/kopete/protocols/oscar/liboscar/serverversionstask.cpp index a6dc557c..336f3b02 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.cpp +++ b/kopete/protocols/oscar/liboscar/serverversionstask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -ServerVersionsTask::ServerVersionsTask( Task* tqparent ) - : Task( tqparent ) +ServerVersionsTask::ServerVersionsTask( Task* parent ) + : Task( parent ) { m_family = 0; } diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h index 532fcec0..ed7f0104 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.h +++ b/kopete/protocols/oscar/liboscar/serverversionstask.h @@ -33,7 +33,7 @@ class ServerVersionsTask : public Task Q_OBJECT TQ_OBJECT public: - ServerVersionsTask( Task* tqparent ); + ServerVersionsTask( Task* parent ); ~ServerVersionsTask(); diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp index 39da3531..332395dc 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp @@ -34,18 +34,18 @@ #include "ssiparamstask.h" #include "transfer.h" -ServiceSetupTask::ServiceSetupTask( Task* tqparent ) - : Task( tqparent ) +ServiceSetupTask::ServiceSetupTask( Task* parent ) + : Task( parent ) { m_finishedTaskCount = 0; - m_locRightsTask = new LocationRightsTask( tqparent ); - m_profileTask = new ProfileTask( tqparent ); - m_blmLimitsTask = new BLMLimitsTask( tqparent ); - m_icbmTask = new ICBMParamsTask( tqparent ); - m_prmTask = new PRMParamsTask( tqparent ); - m_ssiParamTask = new SSIParamsTask( tqparent ); - m_ssiListTask = new SSIListTask( tqparent ); - m_ssiActivateTask = new SSIActivateTask( tqparent ); + m_locRightsTask = new LocationRightsTask( parent ); + m_profileTask = new ProfileTask( parent ); + m_blmLimitsTask = new BLMLimitsTask( parent ); + m_icbmTask = new ICBMParamsTask( parent ); + m_prmTask = new PRMParamsTask( parent ); + m_ssiParamTask = new SSIParamsTask( parent ); + m_ssiListTask = new SSIListTask( parent ); + m_ssiActivateTask = new SSIActivateTask( parent ); TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.h b/kopete/protocols/oscar/liboscar/servicesetuptask.h index ed364353..513344ba 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.h +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.h @@ -40,7 +40,7 @@ class ServiceSetupTask : public Task Q_OBJECT TQ_OBJECT public: - ServiceSetupTask( Task* tqparent ); + ServiceSetupTask( Task* parent ); ~ServiceSetupTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.cpp b/kopete/protocols/oscar/liboscar/snacprotocol.cpp index e7021c4f..708ebb85 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/snacprotocol.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -SnacProtocol::SnacProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +SnacProtocol::SnacProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h index a9b10cbd..04608487 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.h +++ b/kopete/protocols/oscar/liboscar/snacprotocol.h @@ -30,7 +30,7 @@ class SnacProtocol : public InputProtocolBase Q_OBJECT TQ_OBJECT public: - SnacProtocol( TQObject *tqparent = 0, const char *name = 0 ); + SnacProtocol( TQObject *parent = 0, const char *name = 0 ); ~SnacProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp index c03d70d4..a2d2dc76 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp @@ -26,7 +26,7 @@ -SSIActivateTask::SSIActivateTask(Task* tqparent): Task(tqparent) +SSIActivateTask::SSIActivateTask(Task* parent): Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.h b/kopete/protocols/oscar/liboscar/ssiactivatetask.h index 7ca44896..66f0a67b 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.h +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.h @@ -28,7 +28,7 @@ A fire and forget task to send the activation SNAC for the SSI list to the serve class SSIActivateTask : public Task { public: - SSIActivateTask( Task* tqparent ); + SSIActivateTask( Task* parent ); ~SSIActivateTask(); void onGo(); }; diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp index 8a33bb56..bccb754e 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp @@ -25,10 +25,10 @@ #include <kdebug.h> -SSIAuthTask::SSIAuthTask( Task* tqparent ) - : Task( tqparent ) +SSIAuthTask::SSIAuthTask( Task* parent ) + : Task( parent ) { - m_manager = tqparent->client()->ssiManager(); + m_manager = parent->client()->ssiManager(); } SSIAuthTask::~SSIAuthTask() diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h index d7e7c78a..c5d8a351 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.h +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h @@ -31,7 +31,7 @@ class SSIAuthTask : public Task Q_OBJECT TQ_OBJECT public: - SSIAuthTask( Task* tqparent ); + SSIAuthTask( Task* parent ); ~SSIAuthTask(); diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp index 6b10e3fa..a62e6721 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp +++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp @@ -23,7 +23,7 @@ #include "ssimanager.h" #include "transfer.h" -SSIListTask::SSIListTask( Task* tqparent ) : Task( tqparent ) +SSIListTask::SSIListTask( Task* parent ) : Task( parent ) { m_ssiManager = client()->ssiManager(); TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) ); diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.h b/kopete/protocols/oscar/liboscar/ssilisttask.h index 24ee179d..ac0ddfe5 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.h +++ b/kopete/protocols/oscar/liboscar/ssilisttask.h @@ -37,7 +37,7 @@ class SSIListTask : public Task Q_OBJECT TQ_OBJECT public: - SSIListTask( Task* tqparent ); + SSIListTask( Task* parent ); ~SSIListTask(); virtual bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 45f69340..ce39965f 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -42,8 +42,8 @@ public: WORD nextGroupId; }; -SSIManager::SSIManager( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +SSIManager::SSIManager( TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new SSIManagerPrivate; d->complete = false; @@ -214,7 +214,7 @@ Oscar::SSI SSIManager::findContact( const TQString &contact, const TQString &gro return m_dummyItem; } - Oscar::SSI gr = findGroup( group ); // find the tqparent group + Oscar::SSI gr = findGroup( group ); // find the parent group if ( gr.isValid() ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "gr->name= " << gr.name() << diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h index d75d1e17..2d8d4fd1 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.h +++ b/kopete/protocols/oscar/liboscar/ssimanager.h @@ -43,7 +43,7 @@ class KOPETE_EXPORT SSIManager : public TQObject Q_OBJECT TQ_OBJECT public: - SSIManager( TQObject* tqparent = 0, const char* name = 0 ); + SSIManager( TQObject* parent = 0, const char* name = 0 ); ~SSIManager(); diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp index 23164bc0..80a9346c 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp @@ -28,9 +28,9 @@ #include "transfer.h" -SSIModifyTask::SSIModifyTask( Task* tqparent, bool staticTask ) : Task( tqparent ) +SSIModifyTask::SSIModifyTask( Task* parent, bool staticTask ) : Task( parent ) { - m_ssiManager = tqparent->client()->ssiManager(); + m_ssiManager = parent->client()->ssiManager(); m_static = staticTask; m_opType = NoType; m_opSubject = NoSubject; diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.h b/kopete/protocols/oscar/liboscar/ssimodifytask.h index 3093c159..70486cbc 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.h +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.h @@ -51,7 +51,7 @@ This task implements the following SNACs from the SSI family (0x0013): class SSIModifyTask : public Task { public: - SSIModifyTask( Task* tqparent, bool staticTask = false ); + SSIModifyTask( Task* parent, bool staticTask = false ); ~SSIModifyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp index 11239533..1f6fbd9d 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp @@ -27,7 +27,7 @@ using namespace Oscar; -SSIParamsTask::SSIParamsTask(Task* tqparent): Task(tqparent) +SSIParamsTask::SSIParamsTask(Task* parent): Task(parent) { } diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.h b/kopete/protocols/oscar/liboscar/ssiparamstask.h index e0244c6d..abf12aa2 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.h +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.h @@ -26,7 +26,7 @@ class SSIParamsTask : public Task { public: - SSIParamsTask(Task* tqparent); + SSIParamsTask(Task* parent); ~SSIParamsTask(); diff --git a/kopete/protocols/oscar/liboscar/stream.cpp b/kopete/protocols/oscar/liboscar/stream.cpp index 517bde68..2fb302c1 100644 --- a/kopete/protocols/oscar/liboscar/stream.cpp +++ b/kopete/protocols/oscar/liboscar/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h index 2ea1f871..583fa5eb 100644 --- a/kopete/protocols/oscar/liboscar/stream.h +++ b/kopete/protocols/oscar/liboscar/stream.h @@ -43,7 +43,7 @@ public: SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index cc988ebe..9e637d45 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -41,19 +41,19 @@ public: Transfer* transfer; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); - d->client = tqparent->client(); + d->client = parent->client(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Connection* tqparent, bool) +Task::Task(Connection* parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->id = 0; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Connection *Task::client() const diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h index 184abd45..7aaba596 100644 --- a/kopete/protocols/oscar/liboscar/task.h +++ b/kopete/protocols/oscar/liboscar/task.h @@ -40,11 +40,11 @@ class Task : public TQObject TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task( Connection*, bool isRoot ); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Connection* client() const; Transfer *transfer() const; diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp index e69222c1..e68412bc 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp @@ -25,8 +25,8 @@ -TypingNotifyTask::TypingNotifyTask( Task* tqparent ) -: Task( tqparent ) +TypingNotifyTask::TypingNotifyTask( Task* parent ) +: Task( parent ) { m_notificationType = 0x0000; } diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h index b815005a..4940735f 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.h +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h @@ -32,7 +32,7 @@ Q_OBJECT public: enum { Finished = 0x0000, Typed = 0x0001, Begin = 0x0002 }; - TypingNotifyTask( Task* tqparent ); + TypingNotifyTask( Task* parent ); ~TypingNotifyTask(); virtual bool forMe( const Transfer* transfer) const; diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp index c91dea47..fbe7fd5a 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp @@ -26,8 +26,8 @@ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel@kde.org> -UserInfoTask::UserInfoTask( Task* tqparent ) -: Task( tqparent ) +UserInfoTask::UserInfoTask( Task* parent ) +: Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h index 4eadc90c..2b1baf82 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.h +++ b/kopete/protocols/oscar/liboscar/userinfotask.h @@ -35,7 +35,7 @@ class UserInfoTask : public Task Q_OBJECT TQ_OBJECT public: - UserInfoTask( Task* tqparent ); + UserInfoTask( Task* parent ); ~UserInfoTask(); enum { Profile = 0x0001, General = 0x0002, AwayMessage = 0x0003, Capabilities = 0x0004 }; diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp index 48a5684f..1a68f4eb 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp +++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp @@ -22,8 +22,8 @@ #include "buffer.h" #include "connection.h" -UserSearchTask::UserSearchTask( Task* tqparent ) - : ICQTask( tqparent ) +UserSearchTask::UserSearchTask( Task* parent ) + : ICQTask( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h index 4cef65d0..6b187e84 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.h +++ b/kopete/protocols/oscar/liboscar/usersearchtask.h @@ -33,7 +33,7 @@ class UserSearchTask : public ICQTask Q_OBJECT TQ_OBJECT public: - UserSearchTask( Task* tqparent ); + UserSearchTask( Task* parent ); ~UserSearchTask(); diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp index d2fb1f83..17ac0e0c 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.cpp +++ b/kopete/protocols/oscar/liboscar/warningtask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" #include "connection.h" -WarningTask::WarningTask( Task* tqparent ): Task( tqparent ) +WarningTask::WarningTask( Task* parent ): Task( parent ) { } diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h index 0ce90cea..9287f697 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.h +++ b/kopete/protocols/oscar/liboscar/warningtask.h @@ -31,7 +31,7 @@ class WarningTask : public Task Q_OBJECT TQ_OBJECT public: - WarningTask( Task* tqparent ); + WarningTask( Task* parent ); ~WarningTask(); void setContact( const TQString& contact ); diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 95fd6505..89d72641 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -94,8 +94,8 @@ public: } }; -OscarAccount::OscarAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name, bool isICQ) -: Kopete::PasswordedAccount( tqparent, accountID, isICQ ? 8 : 16, name ) +OscarAccount::OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name, bool isICQ) +: Kopete::PasswordedAccount( parent, accountID, isICQ ? 8 : 16, name ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << " accountID='" << accountID << "', isICQ=" << isICQ << endl; diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h index 2371a640..22062d72 100644 --- a/kopete/protocols/oscar/oscaraccount.h +++ b/kopete/protocols/oscar/oscaraccount.h @@ -45,7 +45,7 @@ class KDE_EXPORT OscarAccount : public Kopete::PasswordedAccount TQ_OBJECT public: - OscarAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L, bool isICQ=false); + OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L, bool isICQ=false); virtual ~OscarAccount(); /** Provide the derived accounts and contacts with access to the backend */ @@ -140,7 +140,7 @@ protected: * Protocols using Oscar must implement this to perform the instantiation * of their contact for Kopete. Called by @ref createContact(). * @param contactId theprotocol unique id of the contact - * @param parentContact the tqparent metacontact + * @param parentContact the parent metacontact * @return whether the creation succeeded or not */ virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0; diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index e1b63a8f..3ee9ffed 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -44,8 +44,8 @@ #include <assert.h> OscarContact::OscarContact( Kopete::Account* account, const TQString& name, - Kopete::MetaContact* tqparent, const TQString& icon, const SSI& ssiItem ) -: Kopete::Contact( account, name, tqparent, icon ) + Kopete::MetaContact* parent, const TQString& icon, const SSI& ssiItem ) +: Kopete::Contact( account, name, parent, icon ) { mAccount = static_cast<OscarAccount*>(account); mName = name; diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h index 6f76567e..eae7d3e6 100644 --- a/kopete/protocols/oscar/oscarcontact.h +++ b/kopete/protocols/oscar/oscarcontact.h @@ -64,7 +64,7 @@ Q_OBJECT public: OscarContact( Kopete::Account* account, const TQString& name, - Kopete::MetaContact* tqparent, const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); + Kopete::MetaContact* parent, const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~OscarContact(); diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp index d5136a7e..7a1826cb 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp @@ -24,8 +24,8 @@ #include <tqcombobox.h> #include <klocale.h> -OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, int initialEncoding ) - : KDialogBase( tqparent, 0, false, i18n( "Select Encoding" ), Ok | Cancel ) +OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, int initialEncoding ) + : KDialogBase( parent, 0, false, i18n( "Select Encoding" ), Ok | Cancel ) { int initialEncodingIndex; diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.h b/kopete/protocols/oscar/oscarencodingselectiondialog.h index 12d16fb7..65f36abc 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.h +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.h @@ -29,7 +29,7 @@ class KOPETE_EXPORT OscarEncodingSelectionDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - OscarEncodingSelectionDialog( TQWidget* tqparent = 0, int initialEncoding = 4); + OscarEncodingSelectionDialog( TQWidget* parent = 0, int initialEncoding = 4); ~OscarEncodingSelectionDialog() {} int selectedEncoding() const; diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp index aec5096e..4529f562 100644 --- a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp +++ b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp @@ -24,8 +24,8 @@ #include <tqcheckbox.h> #include <klocale.h> -OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* tqparent) - : KDialogBase( tqparent, 0, false, i18n( "Add Contacts to Server List" ), +OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* parent) + : KDialogBase( parent, 0, false, i18n( "Add Contacts to Server List" ), Ok | Cancel ) { m_contactsList = new OscarListContactsBase( this ); diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.h b/kopete/protocols/oscar/oscarlistnonservercontacts.h index ffdfe692..df4461d4 100644 --- a/kopete/protocols/oscar/oscarlistnonservercontacts.h +++ b/kopete/protocols/oscar/oscarlistnonservercontacts.h @@ -30,7 +30,7 @@ class KOPETE_EXPORT OscarListNonServerContacts : public KDialogBase Q_OBJECT TQ_OBJECT public: - OscarListNonServerContacts( TQWidget* tqparent ); + OscarListNonServerContacts( TQWidget* parent ); ~OscarListNonServerContacts(); void addContacts( const TQStringList& contactList ); diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index 1c717e98..f6d38f6c 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -25,8 +25,8 @@ #include "client.h" -OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* tqparent ) - : KDialogBase( tqparent, 0, false, i18n( "Add Contacts to Visible or Invisible List" ), +OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* parent ) + : KDialogBase( parent, 0, false, i18n( "Add Contacts to Visible or Invisible List" ), Ok | Cancel ), m_client( client ) { m_visibilityUI = new OscarVisibilityBase( this ); diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.h b/kopete/protocols/oscar/oscarvisibilitydialog.h index 114b36f8..213e6941 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.h +++ b/kopete/protocols/oscar/oscarvisibilitydialog.h @@ -34,7 +34,7 @@ class KOPETE_EXPORT OscarVisibilityDialog : public KDialogBase public: typedef TQMap<TQString, TQString> ContactMap; - OscarVisibilityDialog( Client* client, TQWidget* tqparent ); + OscarVisibilityDialog( Client* client, TQWidget* parent ); ~OscarVisibilityDialog() {} void addContacts( const ContactMap& contacts ); diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 82bd0017..1d4836a1 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -67,10 +67,10 @@ void GSMLibEvent::setSubType(GSMLibEvent::SubType t) } ///////////////////////////////////////////////////////////////////// -GSMLibThread::GSMLibThread(TQString dev, GSMLib* tqparent) +GSMLibThread::GSMLibThread(TQString dev, GSMLib* parent) { m_device = dev; - m_parent = tqparent; + m_parent = parent; m_run = true; m_MeTa = NULL; } @@ -348,11 +348,11 @@ void GSMLib::disconnect() } -void GSMLib::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) +void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) { - m_parent = tqparent; + m_parent = parent; m_layout = tqlayout; - TQWidget *configWidget = configureWidget(tqparent); + TQWidget *configWidget = configureWidget(parent); tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } @@ -362,11 +362,11 @@ void GSMLib::send(const Kopete::Message& msg) m_thread->send(msg); } -TQWidget* GSMLib::configureWidget(TQWidget* tqparent) +TQWidget* GSMLib::configureWidget(TQWidget* parent) { if (prefWidget == 0L) - prefWidget = new GSMLibPrefsUI(tqparent); + prefWidget = new GSMLibPrefsUI(parent); loadConfig(); prefWidget->device->setURL(m_device); diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index a3f01995..ac5066c7 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -52,7 +52,7 @@ public: ~GSMLib(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); + void setWidgetContainer(TQWidget* parent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -67,7 +67,7 @@ public slots: protected: virtual void customEvent(TQCustomEvent* e); - TQWidget* configureWidget(TQWidget* tqparent); + TQWidget* configureWidget(TQWidget* parent); void saveConfig(); void loadConfig(); @@ -108,7 +108,7 @@ protected: class GSMLibThread : public TQThread, gsmlib::GsmEvent { public: - GSMLibThread(TQString dev, GSMLib* tqparent); + GSMLibThread(TQString dev, GSMLib* parent); virtual ~GSMLibThread(); virtual void run(); diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index b45793d1..05712501 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -41,12 +41,12 @@ SMSClient::~SMSClient() { } -void SMSClient::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) +void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; - m_parent = tqparent; + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl; + m_parent = parent; m_layout = tqlayout; - TQWidget *configWidget = configureWidget(tqparent); + TQWidget *configWidget = configureWidget(parent); tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } @@ -87,12 +87,12 @@ void SMSClient::send(const Kopete::Message& msg) p->start(KProcess::Block, KProcess::AllOutput); } -TQWidget* SMSClient::configureWidget(TQWidget* tqparent) +TQWidget* SMSClient::configureWidget(TQWidget* parent) { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if (prefWidget == 0L) - prefWidget = new SMSClientPrefsUI(tqparent); + prefWidget = new SMSClientPrefsUI(parent); prefWidget->configDir->setMode(KFile::Directory); TQString configDir; diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index f922a011..06a89050 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -37,7 +37,7 @@ public: ~SMSClient(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); + void setWidgetContainer(TQWidget* parent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -52,7 +52,7 @@ signals: void messageSent(const Kopete::Message &); private: - TQWidget* configureWidget(TQWidget* tqparent); + TQWidget* configureWidget(TQWidget* parent); SMSClientPrefsUI* prefWidget; TQStringList providers(); diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 8249948a..442d7f16 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -73,15 +73,15 @@ void SMSSend::send(const Kopete::Message& msg) m_provider->send(msg); } -void SMSSend::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) +void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; - m_parent = tqparent; + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl; + m_parent = parent; m_layout = tqlayout; // could end up being deleted twice?? delete prefWidget; - prefWidget = new SMSSendPrefsUI(tqparent); + prefWidget = new SMSSendPrefsUI(parent); tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); prefWidget->program->setMode(KFile::Directory); diff --git a/kopete/protocols/sms/services/smssend.h b/kopete/protocols/sms/services/smssend.h index 14adbd20..bd36d89c 100644 --- a/kopete/protocols/sms/services/smssend.h +++ b/kopete/protocols/sms/services/smssend.h @@ -41,7 +41,7 @@ public: virtual void setAccount(Kopete::Account* account); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); + void setWidgetContainer(TQWidget* parent, TQGridLayout* container); int maxSize(); const TQString& description(); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index e2f607aa..ffd0897e 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -32,8 +32,8 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent, const char *name) - : TQObject( tqparent, name ), m_account(account) +SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent, const char *name) + : TQObject( parent, name ), m_account(account) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", m_account = " << m_account << " (should be ok if zero!!)" << endl; diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index 9d899ce8..3ea98307 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -38,7 +38,7 @@ class SMSSendProvider : public TQObject Q_OBJECT TQ_OBJECT public: - SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent = 0, const char* name = 0); + SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent = 0, const char* name = 0); ~SMSSendProvider(); void setAccount(Kopete::Account *account); diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index fcafc9fb..fc12437c 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -34,8 +34,8 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSAccount::SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name ) - : Kopete::Account( tqparent, accountID, name ) +SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name ) + : Kopete::Account( parent, accountID, name ) { setMyself( new SMSContact(this, accountID, accountID, Kopete::ContactList::self()->myself()) ); loadConfig(); diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index 05caa989..db7d0f9a 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -33,7 +33,7 @@ class SMSAccount : public Kopete::Account TQ_OBJECT public: - SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name = 0L ); + SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L ); ~SMSAccount(); virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar diff --git a/kopete/protocols/sms/smsaddcontactpage.cpp b/kopete/protocols/sms/smsaddcontactpage.cpp index a1be6890..c18e5866 100644 --- a/kopete/protocols/sms/smsaddcontactpage.cpp +++ b/kopete/protocols/sms/smsaddcontactpage.cpp @@ -22,8 +22,8 @@ -SMSAddContactPage::SMSAddContactPage(TQWidget *tqparent, const char *name ) - : AddContactPage(tqparent,name) +SMSAddContactPage::SMSAddContactPage(TQWidget *parent, const char *name ) + : AddContactPage(parent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); smsdata = new smsAddUI(this); diff --git a/kopete/protocols/sms/smsaddcontactpage.h b/kopete/protocols/sms/smsaddcontactpage.h index 4c4899d9..25239bcb 100644 --- a/kopete/protocols/sms/smsaddcontactpage.h +++ b/kopete/protocols/sms/smsaddcontactpage.h @@ -28,7 +28,7 @@ class SMSAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - SMSAddContactPage(TQWidget *tqparent=0, const char *name=0); + SMSAddContactPage(TQWidget *parent=0, const char *name=0); ~SMSAddContactPage(); smsAddUI *smsdata; virtual bool validateData(); diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index 19a42549..f47a0b46 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -32,8 +32,8 @@ #include "smsuserpreferences.h" SMSContact::SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *tqparent ) -: Kopete::Contact( _account, phoneNumber, tqparent ), m_phoneNumber( phoneNumber ) + const TQString &displayName, Kopete::MetaContact *parent ) +: Kopete::Contact( _account, phoneNumber, parent ), m_phoneNumber( phoneNumber ) { // kdWarning( 14160 ) << k_funcinfo << " this = " << this << ", phone = " << phoneNumber << endl; setNickName( displayName ); diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h index 1c77f25f..ae11e564 100644 --- a/kopete/protocols/sms/smscontact.h +++ b/kopete/protocols/sms/smscontact.h @@ -35,7 +35,7 @@ class SMSContact : public Kopete::Contact TQ_OBJECT public: SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *tqparent ); + const TQString &displayName, Kopete::MetaContact *parent ); TQPtrList<KAction>* customContextMenuActions(); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 94d480c2..c355c287 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -35,8 +35,8 @@ #include "smsprotocol.h" #include "smsaccount.h" -SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *tqparent, const char */*name*/) - : TQWidget(tqparent), KopeteEditAccountWidget(account) +SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *parent, const char */*name*/) + : TQWidget(parent), KopeteEditAccountWidget(account) { TQVBoxLayout *l = new TQVBoxLayout(this, TQBoxLayout::Down); preferencesDialog = new smsActPrefsUI(this); diff --git a/kopete/protocols/sms/smseditaccountwidget.h b/kopete/protocols/sms/smseditaccountwidget.h index de8ef844..00011639 100644 --- a/kopete/protocols/sms/smseditaccountwidget.h +++ b/kopete/protocols/sms/smseditaccountwidget.h @@ -31,7 +31,7 @@ class SMSEditAccountWidget : public TQWidget, public KopeteEditAccountWidget Q_OBJECT TQ_OBJECT public: - SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); + SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); ~SMSEditAccountWidget(); bool validateData(); diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index 5e17e7ed..cd32d959 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -32,8 +32,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_sms, SMSProtocolFactory( "kopete_sms" ) ) SMSProtocol* SMSProtocol::s_protocol = 0L; -SMSProtocol::SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &/*args*/) -: Kopete::Protocol( SMSProtocolFactory::instance(), tqparent, name ), +SMSProtocol::SMSProtocol(TQObject *parent, const char *name, const TQStringList &/*args*/) +: Kopete::Protocol( SMSProtocolFactory::instance(), parent, name ), SMSOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString(), i18n( "Connecting" ) ), SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ) @@ -51,14 +51,14 @@ SMSProtocol::~SMSProtocol() s_protocol = 0L; } -AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account */*i*/) +AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account */*i*/) { - return new SMSAddContactPage(tqparent); + return new SMSAddContactPage(parent); } -KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new SMSEditAccountWidget(this, account, tqparent); + return new SMSEditAccountWidget(this, account, parent); } SMSProtocol* SMSProtocol::protocol() diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h index 5785407d..a97d1282 100644 --- a/kopete/protocols/sms/smsprotocol.h +++ b/kopete/protocols/sms/smsprotocol.h @@ -43,7 +43,7 @@ class SMSProtocol : public Kopete::Protocol TQ_OBJECT public: - SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &args); + SMSProtocol(TQObject *parent, const char *name, const TQStringList &args); ~SMSProtocol(); static SMSProtocol *protocol(); @@ -54,8 +54,8 @@ public: virtual Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData ); - virtual AddContactPage *createAddContactWidget(TQWidget *tqparent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual AddContactPage *createAddContactWidget(TQWidget *parent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); const Kopete::OnlineStatus SMSOnline; diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h index d448570b..c5ea28ab 100644 --- a/kopete/protocols/sms/smsservice.h +++ b/kopete/protocols/sms/smsservice.h @@ -45,11 +45,11 @@ public: virtual void setAccount(Kopete::Account* account); /** - * Called when the settings widget has a place to be. @param tqparent is the - * settings widget's tqparent and @param tqlayout is the 2xn grid tqlayout it may + * Called when the settings widget has a place to be. @param parent is the + * settings widget's parent and @param tqlayout is the 2xn grid tqlayout it may * use. */ - virtual void setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) = 0; + virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) = 0; virtual void send(const Kopete::Message& msg) = 0; virtual int maxSize() = 0; diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index e78391ae..17c1ea73 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -29,8 +29,8 @@ #include "testbedprotocol.h" -TestbedAccount::TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name ) -: Kopete::Account ( tqparent, accountID , name ) +TestbedAccount::TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name ) +: Kopete::Account ( parent, accountID , name ) { // Init the myself contact setMyself( new TestbedContact( this, accountId(), TestbedContact::Null, accountId(), Kopete::ContactList::self()->myself() ) ); diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h index 71840ff9..c9f1517e 100644 --- a/kopete/protocols/testbed/testbedaccount.h +++ b/kopete/protocols/testbed/testbedaccount.h @@ -37,7 +37,7 @@ class TestbedAccount : public Kopete::Account Q_OBJECT TQ_OBJECT public: - TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name = 0 ); + TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name = 0 ); ~TestbedAccount(); /** * Construct the context menu used for the status bar icon diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp index 1ee83466..9250b9a0 100644 --- a/kopete/protocols/testbed/testbedaddcontactpage.cpp +++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp @@ -26,8 +26,8 @@ #include "testbedaddui.h" -TestbedAddContactPage::TestbedAddContactPage( TQWidget* tqparent, const char* name ) - : AddContactPage(tqparent, name) +TestbedAddContactPage::TestbedAddContactPage( TQWidget* parent, const char* name ) + : AddContactPage(parent, name) { kdDebug(14210) << k_funcinfo << endl; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/protocols/testbed/testbedaddcontactpage.h b/kopete/protocols/testbed/testbedaddcontactpage.h index 3189a635..a39681dd 100644 --- a/kopete/protocols/testbed/testbedaddcontactpage.h +++ b/kopete/protocols/testbed/testbedaddcontactpage.h @@ -32,7 +32,7 @@ class TestbedAddContactPage : public AddContactPage Q_OBJECT TQ_OBJECT public: - TestbedAddContactPage( TQWidget* tqparent = 0, const char* name = 0 ); + TestbedAddContactPage( TQWidget* parent = 0, const char* name = 0 ); ~TestbedAddContactPage(); /** diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index ee816474..bf110872 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -29,8 +29,8 @@ #include "testbedprotocol.h" TestbedContact::TestbedContact( Kopete::Account* _account, const TQString &uniqueName, - const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *tqparent ) -: Kopete::Contact( _account, uniqueName, tqparent ) + const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *parent ) +: Kopete::Contact( _account, uniqueName, parent ) { kdDebug( 14210 ) << k_funcinfo << " uniqueName: " << uniqueName << ", displayName: " << displayName << endl; m_type = type; diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h index f5ac9ed6..30dc6d13 100644 --- a/kopete/protocols/testbed/testbedcontact.h +++ b/kopete/protocols/testbed/testbedcontact.h @@ -42,7 +42,7 @@ public: TestbedContact( Kopete::Account* _account, const TQString &uniqueName, const TestbedContact::TestbedContactType type, const TQString &displayName, - Kopete::MetaContact *tqparent ); + Kopete::MetaContact *parent ); ~TestbedContact(); diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp index 888a05f9..98a52dfc 100644 --- a/kopete/protocols/testbed/testbededitaccountwidget.cpp +++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp @@ -24,8 +24,8 @@ #include "testbedaccount.h" #include "testbedprotocol.h" -TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account) -: TQWidget( tqparent ), KopeteEditAccountWidget( account ) +TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account) +: TQWidget( parent ), KopeteEditAccountWidget( account ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); kdDebug(14210) << k_funcinfo << endl; diff --git a/kopete/protocols/testbed/testbededitaccountwidget.h b/kopete/protocols/testbed/testbededitaccountwidget.h index 4c9d20e4..39b1a39a 100644 --- a/kopete/protocols/testbed/testbededitaccountwidget.h +++ b/kopete/protocols/testbed/testbededitaccountwidget.h @@ -33,7 +33,7 @@ class TestbedEditAccountWidget : public TQWidget, public KopeteEditAccountWidget Q_OBJECT TQ_OBJECT public: - TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); + TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account); ~TestbedEditAccountWidget(); diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp index e8c564e2..301b8a08 100644 --- a/kopete/protocols/testbed/testbedprotocol.cpp +++ b/kopete/protocols/testbed/testbedprotocol.cpp @@ -29,8 +29,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_testbed, TestbedProtocolFactory( "kopete_test TestbedProtocol *TestbedProtocol::s_protocol = 0L; -TestbedProtocol::TestbedProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( TestbedProtocolFactory::instance(), tqparent, name ), +TestbedProtocol::TestbedProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( TestbedProtocolFactory::instance(), parent, name ), testbedOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "O&nline" ) ), testbedAway( Kopete::OnlineStatus::Away, 25, this, 1, "msn_away", i18n( "Away" ), i18n( "&Away" ) ), testbedOffline( Kopete::OnlineStatus::Offline, 25, this, 2, TQString(), i18n( "Offline" ), i18n( "O&ffline" ) ) @@ -74,16 +74,16 @@ Kopete::Contact *TestbedProtocol::deserializeContact( return new TestbedContact(account, contactId, tbcType, displayName, metaContact); } -AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * /* account */ ) +AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * /* account */ ) { kdDebug( 14210 ) << "Creating Add Contact Page" << endl; - return new TestbedAddContactPage( tqparent ); + return new TestbedAddContactPage( parent ); } -KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) +KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) { kdDebug(14210) << "Creating Edit Account Page" << endl; - return new TestbedEditAccountWidget( tqparent, account ); + return new TestbedEditAccountWidget( parent, account ); } Kopete::Account *TestbedProtocol::createNewAccount( const TQString &accountId ) diff --git a/kopete/protocols/testbed/testbedprotocol.h b/kopete/protocols/testbed/testbedprotocol.h index 44a6ba2a..a38dfe20 100644 --- a/kopete/protocols/testbed/testbedprotocol.h +++ b/kopete/protocols/testbed/testbedprotocol.h @@ -29,7 +29,7 @@ class TestbedProtocol : public Kopete::Protocol Q_OBJECT TQ_OBJECT public: - TestbedProtocol(TQObject *tqparent, const char *name, const TQStringList &args); + TestbedProtocol(TQObject *parent, const char *name, const TQStringList &args); ~TestbedProtocol(); /** * Convert the serialised data back into a TestbedContact and add this @@ -43,11 +43,11 @@ public: /** * Generate the widget needed to add TestbedContacts */ - virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account ); /** * Generate the widget needed to add/edit accounts for this protocol */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); /** * Generate a TestbedAccount */ diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index fd6f6743..d5453978 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -27,8 +27,8 @@ #include <kdebug.h> #include <klocale.h> -TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) -: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, tqparent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ), +TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) +: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ), KDialogBase::Close, KDialogBase::Close, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.h b/kopete/protocols/testbed/ui/testbedwebcamdialog.h index 93223866..ff622a12 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.h +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.h @@ -42,7 +42,7 @@ class TestbedWebcamDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - TestbedWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); + TestbedWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); ~TestbedWebcamDialog(); public slots: diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 2b90459e..eb881c70 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -34,8 +34,8 @@ class KPopupMenu; -WPAccount::WPAccount(WPProtocol *tqparent, const TQString &accountID, const char *name) - : Kopete::Account(tqparent, accountID, name) +WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name) + : Kopete::Account(parent, accountID, name) { // kdDebug(14170) << "WPAccount::WPAccount()" << endl; diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index d11d5885..04f8ea20 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -52,7 +52,7 @@ class WPAccount : public Kopete::Account // Kopete::Account overloading public: - WPAccount(WPProtocol *tqparent, const TQString& accountID, const char *name = 0); + WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0); ~WPAccount(); virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index a681f48b..25e4b6d8 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -36,9 +36,9 @@ #include "wpaccount.h" #include "wpaddcontact.h" -WPAddContact::WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name) : AddContactPage(tqparent, name) +WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name) : AddContactPage(parent, name) { -// kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <tqparent>, " << name << ")" << endl; +// kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <parent>, " << name << ")" << endl; (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new WPAddContactBase(this); diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h index 03b3d51d..59ebaecd 100644 --- a/kopete/protocols/winpopup/wpaddcontact.h +++ b/kopete/protocols/winpopup/wpaddcontact.h @@ -41,7 +41,7 @@ private: WPAddContactBase *theDialog; public: - WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name = 0); + WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name = 0); ~WPAddContact(); virtual bool validateData(); diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 1fd29905..1aff6e32 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -30,7 +30,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, const TQString &nickName, Kopete::MetaContact *metaContact) : Kopete::Contact(account, newHostName, metaContact) { -// kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <tqparent>)" << endl; +// kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <parent>)" << endl; kdDebug(14170) << "WPContact::WPContact: " << this << endl; TQString theNickName = nickName; @@ -57,7 +57,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons TQPtrList<KAction> * WPContact::customContextMenuActions() { - //myActionCollection = new KActionCollection(tqparent); + //myActionCollection = new KActionCollection(parent); return 0; } diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 05312330..217ac462 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -45,10 +45,10 @@ #include "wpeditaccount.h" #include "wpprotocol.h" -WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount) - : WPEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount) +WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) + : WPEditAccountBase(parent), KopeteEditAccountWidget(theAccount) { - kdDebug(14170) << "WPEditAccount::WPEditAccount(<tqparent>, <theAccount>)"; + kdDebug(14170) << "WPEditAccount::WPEditAccount(<parent>, <theAccount>)"; mProtocol = WPProtocol::protocol(); diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h index f573c000..4101c37a 100644 --- a/kopete/protocols/winpopup/wpeditaccount.h +++ b/kopete/protocols/winpopup/wpeditaccount.h @@ -42,7 +42,7 @@ private: WPAccount *mAccount; public: - WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount); + WPEditAccount(TQWidget *parent, Kopete::Account *theAccount); virtual bool validateData(); void writeConfig(); diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 610cb598..a6805a7e 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -48,8 +48,8 @@ typedef KGenericFactory<WPProtocol> WPProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_wp, WPProtocolFactory( "kopete_wp" ) ) // WP Protocol -WPProtocol::WPProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( WPProtocolFactory::instance(), tqparent, name ), +WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( WPProtocolFactory::instance(), parent, name ), WPOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n("Online"), i18n("Online")), WPAway( Kopete::OnlineStatus::Away, 20, this, 1, "wp_away", i18n("Away"), i18n("Away")), WPOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n("Offline"), i18n("Offline")) @@ -79,11 +79,11 @@ WPProtocol::~WPProtocol() sProtocol = 0; } -AddContactPage *WPProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount) +AddContactPage *WPProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount) { -// kdDebug(14170) << "WPProtocol::createAddContactWidget(<tqparent>, " << theAccount << ")" << endl; +// kdDebug(14170) << "WPProtocol::createAddContactWidget(<parent>, " << theAccount << ")" << endl; - return new WPAddContact(tqparent, dynamic_cast<WPAccount *>(theAccount)); + return new WPAddContact(parent, dynamic_cast<WPAccount *>(theAccount)); } Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContact, @@ -108,9 +108,9 @@ Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContac return theAccount->contacts()[contactId]; } -KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new WPEditAccount(tqparent, account); + return new WPEditAccount(parent, account); } Kopete::Account *WPProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h index defd7dc8..acff4cc0 100644 --- a/kopete/protocols/winpopup/wpprotocol.h +++ b/kopete/protocols/winpopup/wpprotocol.h @@ -52,11 +52,11 @@ class WPProtocol : public Kopete::Protocol // Kopete::Protocol overloading public: - WPProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + WPProtocol( TQObject *parent, const char *name, const TQStringList &args ); ~WPProtocol(); - virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); const TQStringList getGroups() {return popupClient->getGroups(); } diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index d5e01138..c602b70e 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -32,8 +32,8 @@ #include "wpaccount.h" #include "wpcontact.h" -WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *tqparent, const char* name ) - : KDialogBase( tqparent, name, false, TQString(), Close, Close, false ), m_contact(contact), +WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *parent, const char* name ) + : KDialogBase( parent, name, false, TQString(), Close, Close, false ), m_contact(contact), Comment(i18n("N/A")), Workgroup(i18n("N/A")), OS(i18n("N/A")), Software(i18n("N/A")) { // kdDebug( 14170 ) << k_funcinfo << endl; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index bea23dc8..4d9bd098 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -37,7 +37,7 @@ class WPUserInfo : public KDialogBase TQ_OBJECT public: - WPUserInfo( WPContact *, WPAccount *, TQWidget *tqparent = 0, const char* name = "WPUserInfo" ); + WPUserInfo( WPContact *, WPAccount *, TQWidget *parent = 0, const char* name = "WPUserInfo" ); void startDetailsProcess(const TQString &host); diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp index 384402e9..8ca3a4cd 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp @@ -64,9 +64,9 @@ public: }; //! -//! Constructs a ByteStream object with tqparent \a tqparent. -ByteStream::ByteStream(TQObject *tqparent) -:TQObject(tqparent) +//! Constructs a ByteStream object with parent \a parent. +ByteStream::ByteStream(TQObject *parent) +:TQObject(parent) { // kdDebug(14181) << k_funcinfo << endl; d = new Private; diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h index c4dc96e1..9104bbce 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.h @@ -33,7 +33,7 @@ class ByteStream : public TQObject TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *tqparent=0); + ByteStream(TQObject *parent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp index 757f7d98..a92cfc8f 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -ChangeStatusTask::ChangeStatusTask(Task* tqparent) : Task(tqparent) +ChangeStatusTask::ChangeStatusTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h index 50a2051b..ffeb5301 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h @@ -30,7 +30,7 @@ class ChangeStatusTask : public Task { public: enum Type { Available, Away }; - ChangeStatusTask(Task *tqparent); + ChangeStatusTask(Task *parent); ~ChangeStatusTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp index 6d7a987d..3be83a79 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <kdebug.h> -ChatSessionTask::ChatSessionTask(Task* tqparent) : Task(tqparent) +ChatSessionTask::ChatSessionTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h index e1f9f498..eee7cdc9 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h @@ -30,7 +30,7 @@ class ChatSessionTask : public Task { public: enum Type { RegisterSession, UnregisterSession }; - ChatSessionTask(Task *tqparent); + ChatSessionTask(Task *parent); ~ChatSessionTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h index 9fc4825e..586eead5 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.h +++ b/kopete/protocols/yahoo/libkyahoo/client.h @@ -53,7 +53,7 @@ Q_OBJECT enum LogLevel { Debug, Info, Notice, Warning, Error, Critical }; - Client(TQObject *tqparent=0); + Client(TQObject *parent=0); ~Client(); /** diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp index 105d9de6..6ca9ae06 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <kdebug.h> -ConferenceTask::ConferenceTask(Task* tqparent) : Task(tqparent) +ConferenceTask::ConferenceTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h index aff52228..4490fc6a 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h @@ -29,7 +29,7 @@ class ConferenceTask : public Task Q_OBJECT TQ_OBJECT public: - ConferenceTask(Task *tqparent); + ConferenceTask(Task *parent); ~ConferenceTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/connector.cpp b/kopete/protocols/yahoo/libkyahoo/connector.cpp index 36912011..83910204 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *tqparent) -:TQObject(tqparent) +Connector::Connector(TQObject *parent) +:TQObject(parent) { setPeerAddressNone(); } diff --git a/kopete/protocols/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h index f5b1917a..a15f137b 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.h +++ b/kopete/protocols/yahoo/libkyahoo/connector.h @@ -32,7 +32,7 @@ class Connector : public TQObject Q_OBJECT TQ_OBJECT public: - Connector(TQObject *tqparent=0); + Connector(TQObject *parent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp index f48bd52d..fd9657f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> //#include <kcodecs.h> -FileTransferNotifierTask::FileTransferNotifierTask(Task* tqparent) : Task(tqparent) +FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h index 84b50849..9851bf60 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h @@ -32,7 +32,7 @@ class FileTransferNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - FileTransferNotifierTask(Task *tqparent); + FileTransferNotifierTask(Task *parent); ~FileTransferNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp index 53068b58..5ef1047d 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp @@ -19,8 +19,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) + : TQObject(parent, name) { } diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h index 3c610cdf..683202f4 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); + InputProtocolBase(TQObject *parent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.cpp b/kopete/protocols/yahoo/libkyahoo/listtask.cpp index a368ac5b..d299f963 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/listtask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -ListTask::ListTask(Task* tqparent) : Task(tqparent) +ListTask::ListTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h index 2c487c0c..cd7718e3 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.h +++ b/kopete/protocols/yahoo/libkyahoo/listtask.h @@ -30,7 +30,7 @@ class ListTask : public Task Q_OBJECT TQ_OBJECT public: - ListTask(Task *tqparent); + ListTask(Task *parent); ~ListTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 7c46229b..d653ecf1 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -37,7 +37,7 @@ extern "C" #include "libyahoo.h" } -LoginTask::LoginTask(Task* tqparent) : Task(tqparent) +LoginTask::LoginTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; mState = InitialState; diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h index 88fc53d3..30c01ffe 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.h +++ b/kopete/protocols/yahoo/libkyahoo/logintask.h @@ -40,7 +40,7 @@ class LoginTask : public Task Q_OBJECT TQ_OBJECT public: - LoginTask(Task *tqparent); + LoginTask(Task *parent); ~LoginTask(); bool take(Transfer* transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp index 07fc1ae4..4816ba44 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <kdebug.h> -LogoffTask::LogoffTask(Task* tqparent) : Task(tqparent) +LogoffTask::LogoffTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.h b/kopete/protocols/yahoo/libkyahoo/logofftask.h index af29512a..b04f8f53 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.h +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.h @@ -26,7 +26,7 @@ class LogoffTask : public Task { public: - LogoffTask(Task *tqparent); + LogoffTask(Task *parent); ~LogoffTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index 4c86bb20..133b17cf 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -MailNotifierTask::MailNotifierTask(Task* tqparent) : Task(tqparent) +MailNotifierTask::MailNotifierTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h index 7faba303..cbdbe3d7 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h @@ -30,7 +30,7 @@ class MailNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - MailNotifierTask(Task *tqparent); + MailNotifierTask(Task *parent); ~MailNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp index 522f407f..769b4abe 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -MessageReceiverTask::MessageReceiverTask(Task* tqparent) : Task(tqparent) +MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h index 459b851e..d95fa135 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h @@ -30,7 +30,7 @@ class MessageReceiverTask : public Task Q_OBJECT TQ_OBJECT public: - MessageReceiverTask(Task *tqparent); + MessageReceiverTask(Task *parent); ~MessageReceiverTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp index 84b7f012..e83b1e4b 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -ModifyBuddyTask::ModifyBuddyTask(Task* tqparent) : Task(tqparent) +ModifyBuddyTask::ModifyBuddyTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h index 3d353086..266a3f00 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: enum Type { AddBuddy, RemoveBuddy, MoveBuddy }; - ModifyBuddyTask(Task *tqparent); + ModifyBuddyTask(Task *parent); ~ModifyBuddyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index a9916851..3888bef8 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -31,7 +31,7 @@ #include <kbufferedsocket.h> using namespace KNetwork; -ModifyYABTask::ModifyYABTask(Task* tqparent) : Task(tqparent) +ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; m_socket = 0; diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h index ef1a97eb..8030e011 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h @@ -38,7 +38,7 @@ class ModifyYABTask : public Task TQ_OBJECT public: enum Action { AddEntry, EditEntry, DeleteEntry }; - ModifyYABTask(Task *tqparent); + ModifyYABTask(Task *parent); ~ModifyYABTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp index cf7a6e34..a7245fe6 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp @@ -25,7 +25,7 @@ #include <klocale.h> -PictureNotifierTask::PictureNotifierTask(Task* tqparent) : Task(tqparent) +PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h index bfd03303..7e09be19 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h @@ -31,7 +31,7 @@ class PictureNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - PictureNotifierTask(Task *tqparent); + PictureNotifierTask(Task *parent); ~PictureNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp index 25b80abe..c453ff9d 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <kdebug.h> -PingTask::PingTask(Task* tqparent) : Task(tqparent) +PingTask::PingTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.h b/kopete/protocols/yahoo/libkyahoo/pingtask.h index 47453709..f1c2f6a7 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.h +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.h @@ -27,7 +27,7 @@ class PingTask : public Task { public: - PingTask(Task *tqparent); + PingTask(Task *parent); ~PingTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index a614f0b8..3943cd22 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -28,7 +28,7 @@ #include <kio/job.h> #include <kio/jobclasses.h> -ReceiveFileTask::ReceiveFileTask(Task* tqparent) : Task(tqparent) +ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h index 93f3261e..bc429b30 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h @@ -39,7 +39,7 @@ class ReceiveFileTask : public Task TQ_OBJECT public: enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject }; - ReceiveFileTask(Task *tqparent); + ReceiveFileTask(Task *parent); ~ReceiveFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp index 59173389..55fb046e 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -RequestPictureTask::RequestPictureTask(Task* tqparent) : Task(tqparent) +RequestPictureTask::RequestPictureTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h index d2a901bb..4152afa9 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h @@ -29,7 +29,7 @@ class RequestPictureTask : public Task Q_OBJECT TQ_OBJECT public: - RequestPictureTask(Task *tqparent); + RequestPictureTask(Task *parent); virtual ~RequestPictureTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp index 1f23a40b..34e94c69 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <kdebug.h> -SendAuthRespTask::SendAuthRespTask(Task* tqparent) : Task(tqparent) +SendAuthRespTask::SendAuthRespTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h index 8740cf50..4f69f156 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h @@ -30,7 +30,7 @@ class SendAuthRespTask : public Task Q_OBJECT TQ_OBJECT public: - SendAuthRespTask(Task *tqparent); + SendAuthRespTask(Task *parent); ~SendAuthRespTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index 06c9e395..8c277525 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -29,7 +29,7 @@ using namespace KNetwork; -SendFileTask::SendFileTask(Task* tqparent) : Task(tqparent) +SendFileTask::SendFileTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h index 49f7fbaf..70402a2d 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h @@ -34,7 +34,7 @@ class SendFileTask : public Task Q_OBJECT TQ_OBJECT public: - SendFileTask(Task *tqparent); + SendFileTask(Task *parent); ~SendFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp index 438c330f..828c6832 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <klocale.h> -SendMessageTask::SendMessageTask(Task* tqparent) : Task(tqparent) +SendMessageTask::SendMessageTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h index 52846a3d..e21d9029 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h @@ -27,7 +27,7 @@ class TQString; class SendMessageTask : public Task { public: - SendMessageTask(Task *tqparent); + SendMessageTask(Task *parent); ~SendMessageTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp index 00055725..3f4f83b2 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -SendNotifyTask::SendNotifyTask(Task* tqparent) : Task(tqparent) +SendNotifyTask::SendNotifyTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h index b4e84658..c55f8004 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h @@ -32,7 +32,7 @@ public: enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame }; enum State { Active = 1, NotActive = 0 }; - SendNotifyTask(Task *tqparent); + SendNotifyTask(Task *parent); ~SendNotifyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index f4e8dcf9..a9e76332 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -31,7 +31,7 @@ using namespace KNetwork; -SendPictureTask::SendPictureTask(Task* tqparent) : Task(tqparent) +SendPictureTask::SendPictureTask(Task* parent) : Task(parent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_socket = 0; diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index 40e80378..861d0dd5 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -39,7 +39,7 @@ Q_OBJECT public: enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus }; - SendPictureTask(Task *tqparent); + SendPictureTask(Task *parent); virtual ~SendPictureTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index 3d0802d1..95e06b3c 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <klocale.h> -StatusNotifierTask::StatusNotifierTask(Task* tqparent) : Task(tqparent) +StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 62668947..8ed029f5 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -31,7 +31,7 @@ class StatusNotifierTask : public Task Q_OBJECT TQ_OBJECT public: - StatusNotifierTask(Task *tqparent); + StatusNotifierTask(Task *parent); ~StatusNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp index ee9bb6d3..9dcc2431 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp @@ -21,7 +21,7 @@ #include "client.h" #include <tqstring.h> -StealthTask::StealthTask(Task* tqparent) : Task(tqparent) +StealthTask::StealthTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h index 6a1b0b2e..aef13038 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h @@ -29,7 +29,7 @@ class TQString; class StealthTask : public Task { public: - StealthTask(Task *tqparent); + StealthTask(Task *parent); ~StealthTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/stream.cpp b/kopete/protocols/yahoo/libkyahoo/stream.cpp index 240a8144..82d6fe52 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *tqparent) -:TQObject(tqparent) +Stream::Stream(TQObject *parent) +:TQObject(parent) { } diff --git a/kopete/protocols/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h index 244519f7..cabcc9fc 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.h +++ b/kopete/protocols/yahoo/libkyahoo/stream.h @@ -44,7 +44,7 @@ public: SystemShutdown }; - Stream(TQObject *tqparent=0); + Stream(TQObject *parent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index c17568ee..6ad9994c 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -40,22 +40,22 @@ public: Transfer * transfer; }; -Task::Task(Task *tqparent) -:TQObject(tqparent) +Task::Task(Task *parent) +:TQObject(parent) { init(); d->transfer = 0; - d->client = tqparent->client(); + d->client = parent->client(); //d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *tqparent, bool) +Task::Task(Client *parent, bool) :TQObject(0) { init(); - d->client = tqparent; + d->client = parent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->transfer = 0; } -Task *Task::tqparent() const +Task *Task::parent() const { - return (Task *)TQObject::tqparent(); + return (Task *)TQObject::parent(); } Client *Task::client() const diff --git a/kopete/protocols/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h index fcdaf9ef..22458a8f 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.h +++ b/kopete/protocols/yahoo/libkyahoo/task.h @@ -33,11 +33,11 @@ class Task : public TQObject TQ_OBJECT public: enum { ErrDisc }; - Task(Task *tqparent); + Task(Task *parent); Task( Client *, bool isRoot ); virtual ~Task(); - Task *tqparent() const; + Task *parent() const; Client *client() const; Transfer *transfer() const; diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index d50d68b2..8c85705c 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -33,7 +33,7 @@ using namespace KNetwork; -WebcamTask::WebcamTask(Task* tqparent) : Task(tqparent) +WebcamTask::WebcamTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; transmittingData = false; @@ -355,7 +355,7 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) // Send Invitation packets for(it = pendingInvitations.begin(); it != pendingInvitations.end(); it++) { - SendNotifyTask *snt = new SendNotifyTask( tqparent() ); + SendNotifyTask *snt = new SendNotifyTask( parent() ); snt->setTarget( *it ); snt->setType( SendNotifyTask::NotifyWebcamInvite ); snt->go( true ); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h index db3756ff..1aff0537 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h @@ -59,7 +59,7 @@ class WebcamTask : public Task Q_OBJECT TQ_OBJECT public: - WebcamTask(Task *tqparent); + WebcamTask(Task *parent); ~WebcamTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index be274230..278dcd31 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -27,7 +27,7 @@ #include <kio/jobclasses.h> #include <klocale.h> -YABTask::YABTask(Task* tqparent) : Task(tqparent) +YABTask::YABTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h index 16620fcd..3970e4a6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h @@ -36,7 +36,7 @@ class YABTask : public Task Q_OBJECT TQ_OBJECT public: - YABTask(Task *tqparent); + YABTask(Task *parent); ~YABTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index 6b69bc70..3e2c4a19 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -22,8 +22,8 @@ #include "yahoobytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *tqparent ) - : ByteStream ( tqparent ) +KNetworkByteStream::KNetworkByteStream( TQObject *parent ) + : ByteStream ( parent ) { kdDebug( 14181 ) << "Instantiating new KNetwork byte stream." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index e84f70b0..d08641a9 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -35,7 +35,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkByteStream ( TQObject *tqparent = 0 ); + KNetworkByteStream ( TQObject *parent = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 3f3af310..ad70d3c6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -27,7 +27,7 @@ #include <kio/jobclasses.h> #include <tqdom.h> -YahooChatTask::YahooChatTask(Task* tqparent) : Task(tqparent) +YahooChatTask::YahooChatTask(Task* parent) : Task(parent) { kdDebug(YAHOO_RAW_DEBUG) ; m_loggedIn = false; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h index ef20a815..a971cf0c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h @@ -43,7 +43,7 @@ class YahooChatTask : public Task Q_OBJECT TQ_OBJECT public: - YahooChatTask(Task *tqparent); + YahooChatTask(Task *parent); virtual ~YahooChatTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 3a15b03c..0d05d853 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -102,8 +102,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *tqparent) -:Stream(tqparent), d(new Private()) +ClientStream::ClientStream(Connector *conn, TQObject *parent) +:Stream(parent), d(new Private()) { kdDebug(YAHOO_RAW_DEBUG) ; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h index bc56eafd..87b60c82 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h @@ -72,7 +72,7 @@ public: BindConflict // resource in-use }; - explicit ClientStream(Connector *conn, TQObject *tqparent=0); + explicit ClientStream(Connector *conn, TQObject *parent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index dc54bf82..af485840 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -25,8 +25,8 @@ #include "yahoobytestream.h" #include "yahootypes.h" -KNetworkConnector::KNetworkConnector( TQObject *tqparent ) - : Connector( tqparent ) +KNetworkConnector::KNetworkConnector( TQObject *parent ) + : Connector( parent ) { kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h index 667138ed..889382bf 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - KNetworkConnector( TQObject *tqparent = 0 ); + KNetworkConnector( TQObject *parent = 0 ); virtual ~KNetworkConnector(); diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp index 5517c3f2..d7a13b85 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp @@ -36,8 +36,8 @@ using namespace Yahoo; -YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name) - : InputProtocolBase(tqparent, name) +YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name) + : InputProtocolBase(parent, name) { } diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h index 1703e36f..8fa91498 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h @@ -29,7 +29,7 @@ Q_OBJECT public: - YMSGProtocol( TQObject *tqparent = 0, const char *name = 0 ); + YMSGProtocol( TQObject *parent = 0, const char *name = 0 ); ~YMSGProtocol(); /** diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 002c740b..144a0f33 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -270,10 +270,10 @@ <cstring>edtServerAddress</cstring> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string> + <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> + <string>The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> </property> </widget> <widget class="TQLineEdit"> @@ -287,10 +287,10 @@ <string>scs.msg.yahoo.com</string> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string> + <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> + <string>The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> </property> </widget> <widget class="TQLabel"> diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index 6291f252..594e7a01 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -22,7 +22,7 @@ #include <tqlistbox.h> #include <tqlineedit.h> -YahooInviteListImpl::YahooInviteListImpl(TQWidget *tqparent, const char *name) : YahooInviteListBase(tqparent,name) +YahooInviteListImpl::YahooInviteListImpl(TQWidget *parent, const char *name) : YahooInviteListBase(parent,name) { listFriends->setSelectionMode( TQListBox::Extended ); listInvited->setSelectionMode( TQListBox::Extended ); diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h index 270fef08..30109a7d 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h @@ -27,7 +27,7 @@ class YahooInviteListImpl : public YahooInviteListBase Q_OBJECT TQ_OBJECT public: - YahooInviteListImpl(TQWidget *tqparent=0, const char *name=0); + YahooInviteListImpl(TQWidget *parent=0, const char *name=0); ~YahooInviteListImpl(); void fillFriendList( const TQStringList &buddies ); diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 2b3e357e..a19ebfff 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -39,8 +39,8 @@ #include "yahoootherinfowidget.h" #include "yahoocontact.h" -YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * tqparent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) +YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) { kdDebug(14180) << k_funcinfo << "Creating new yahoo user info widget" << endl; m_contact = c; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index b7f9f3d2..6778a1af 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -34,7 +34,7 @@ class YahooUserInfoDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - YahooUserInfoDialog( YahooContact *c, TQWidget* tqparent = 0, const char* name = 0 ); + YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 ); void setAccountConnected( bool isOnline ); signals: void saveYABEntry( YABEntry & ); diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index 9c37c07d..640164f1 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -27,9 +27,9 @@ #include <webcamwidget.h> -YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) +YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), - KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ) + KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h index eb8e1626..3718841a 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h @@ -35,7 +35,7 @@ class YahooWebcamDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - YahooWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); + YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); ~YahooWebcamDialog(); void setViewer( const TQStringList & ); diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 93395746..ecfb8139 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -66,14 +66,14 @@ #include "yabentry.h" #include "yahoouserinfodialog.h" -YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, const char *name) - : Kopete::PasswordedAccount(tqparent, accountId, 0, name) +YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, const char *name) + : Kopete::PasswordedAccount(parent, accountId, 0, name) { // first things first - initialise internals stateOnConnection = 0; theHaveContactList = false; - m_protocol = tqparent; + m_protocol = parent; m_session = new Client( this ); m_lastDisconnectCode = 0; m_currentMailCount = 0; @@ -101,7 +101,7 @@ YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, c YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); - _myself->setOnlineStatus( tqparent->Offline ); + _myself->setOnlineStatus( parent->Offline ); myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, configGroup()->readEntry( "iconRemoteUrl", "" ) ); myself()->setProperty( Kopete::Global::Properties::self()->photo(), configGroup()->readEntry( "iconLocalUrl", "" ) ); myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readEntry( "iconCheckSum", 0 ) ); diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index ac70d510..7cfc6f84 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -70,7 +70,7 @@ public: enum SignalConnectionType { MakeConnections, DeleteConnections }; - YahooAccount(YahooProtocol *tqparent,const TQString& accountID, const char *name = 0); + YahooAccount(YahooProtocol *parent,const TQString& accountID, const char *name = 0); ~YahooAccount(); /* diff --git a/kopete/protocols/yahoo/yahooaddcontact.cpp b/kopete/protocols/yahoo/yahooaddcontact.cpp index df9bca6d..af3e1bc5 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.cpp +++ b/kopete/protocols/yahoo/yahooaddcontact.cpp @@ -33,9 +33,9 @@ #include "yahooaccount.h" // Yahoo Add Contact page -YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *tqparent, const char *name): AddContactPage(tqparent, name) +YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *parent, const char *name): AddContactPage(parent, name) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <tqparent>, " << name << ")" << endl; + kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <parent>, " << name << ")" << endl; (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new YahooAddContactBase(this); diff --git a/kopete/protocols/yahoo/yahooaddcontact.h b/kopete/protocols/yahoo/yahooaddcontact.h index ad07eb69..5f2e5744 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.h +++ b/kopete/protocols/yahoo/yahooaddcontact.h @@ -41,7 +41,7 @@ private: YahooAddContactBase *theDialog; public: - YahooAddContact(YahooProtocol *owner, TQWidget *tqparent = 0, const char *name = 0); + YahooAddContact(YahooProtocol *owner, TQWidget *parent = 0, const char *name = 0); ~YahooAddContact(); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index b43fb476..e047e849 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -47,7 +47,7 @@ #include "yahooeditaccount.h" // Yahoo Add Contact page -YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent, const char* /*name*/): YahooEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount) +YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent, const char* /*name*/): YahooEditAccountBase(parent), KopeteEditAccountWidget(theAccount) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; diff --git a/kopete/protocols/yahoo/yahooeditaccount.h b/kopete/protocols/yahoo/yahooeditaccount.h index 47a445f8..de7dcfd9 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.h +++ b/kopete/protocols/yahoo/yahooeditaccount.h @@ -42,7 +42,7 @@ private: Kopete::UI::PasswordWidget *mPasswordWidget; public: - YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); + YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index fc132701..6197aa86 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -37,8 +37,8 @@ typedef KGenericFactory<YahooProtocol> YahooProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_yahoo, YahooProtocolFactory( "kopete_yahoo" ) ) -YahooProtocol::YahooProtocol( TQObject *tqparent, const char *name, const TQStringList & ) - : Kopete::Protocol( YahooProtocolFactory::instance(), tqparent, name ), +YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & ) + : Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ), Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ), @@ -187,15 +187,15 @@ Kopete::Contact *YahooProtocol::deserializeContact( Kopete::MetaContact *metaCon return theAccount->contacts()[contactId]; } -AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * tqparent , Kopete::Account* ) +AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * parent , Kopete::Account* ) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<tqparent>)" << endl; - return new YahooAddContact(this, tqparent); + kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<parent>)" << endl; + return new YahooAddContact(this, parent); } -KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) +KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) { - return new YahooEditAccount(this, account, tqparent); + return new YahooEditAccount(this, account, parent); } Kopete::Account *YahooProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index f454e4c6..c12cb8c9 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -44,7 +44,7 @@ class YahooProtocol : public Kopete::Protocol Q_OBJECT TQ_OBJECT public: - YahooProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); + YahooProtocol( TQObject *parent, const char *name, const TQStringList &args ); ~YahooProtocol(); //Online Statuses @@ -133,8 +133,8 @@ public: Kopete::OnlineStatus statusFromYahoo( int status ); public slots: - virtual AddContactPage *createAddContactWidget(TQWidget * tqparent, Kopete::Account* a); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); + virtual AddContactPage *createAddContactWidget(TQWidget * parent, Kopete::Account* a); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); virtual Kopete::Account *createNewAccount(const TQString &accountId); diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 5ea7b340..7d50e900 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -37,8 +37,8 @@ #include "yahooverifyaccount.h" #include "yahooaccount.h" -YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent, const char *name) -: KDialogBase(tqparent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, +YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, Apply, true ) { mTheAccount = account; diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h index c78d6e11..666e3561 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.h +++ b/kopete/protocols/yahoo/yahooverifyaccount.h @@ -37,7 +37,7 @@ private: KTempFile *mFile; YahooVerifyAccountBase *mTheDialog; public: - YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0); + YahooVerifyAccount(Kopete::Account *account, TQWidget *parent = 0, const char *name = 0); ~YahooVerifyAccount(); virtual bool validateData(); @@ -93,7 +93,7 @@ traffic is received by a Server object, it simply drops the connection. A WebServer object is responsible for bandwidth management. -A Server object may not send data until it is told to by its tqparent (WebServer) +A Server object may not send data until it is told to by its parent (WebServer) object. A Server object sends a readyToWrite(this) signal when it has data to send. diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index 0f1134e4..d7f72ea1 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -38,10 +38,10 @@ namespace KPF ActiveMonitor::ActiveMonitor ( WebServer * server, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget (tqparent, name), + : TQWidget (parent, name), server_ (server) { view_ = new TQListView(this); diff --git a/kpf/src/ActiveMonitor.h b/kpf/src/ActiveMonitor.h index 7beb7828..b3c792f2 100644 --- a/kpf/src/ActiveMonitor.h +++ b/kpf/src/ActiveMonitor.h @@ -58,7 +58,7 @@ namespace KPF ActiveMonitor ( WebServer * server, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 367ff768..04fe857d 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -31,8 +31,8 @@ namespace KPF { - ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * tqparent) - : TQListViewItem (tqparent), + ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * parent) + : TQListViewItem (parent), server_ (server), size_ (0), sent_ (0) diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h index fe8b5aa3..8cc347e2 100644 --- a/kpf/src/ActiveMonitorItem.h +++ b/kpf/src/ActiveMonitorItem.h @@ -60,7 +60,7 @@ namespace KPF /** * @param server the associated Server object. */ - ActiveMonitorItem(Server * server, TQListView * tqparent); + ActiveMonitorItem(Server * server, TQListView * parent); virtual ~ActiveMonitorItem(); /** diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 1d4ef84b..238ddefa 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -34,10 +34,10 @@ namespace KPF ActiveMonitorWindow::ActiveMonitorWindow ( WebServer * server, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KMainWindow(tqparent, name) + : KMainWindow(parent, name) { setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root())); diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h index 5db33194..9dc0a00c 100644 --- a/kpf/src/ActiveMonitorWindow.h +++ b/kpf/src/ActiveMonitorWindow.h @@ -53,7 +53,7 @@ namespace KPF ActiveMonitorWindow ( WebServer * server, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index 8311231c..983ae0c3 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -54,7 +54,7 @@ static const char kpfVersion[] = "1.0.1"; extern "C" { KDE_EXPORT KPanelApplet * - init(TQWidget * tqparent, const TQString & configFile) + init(TQWidget * parent, const TQString & configFile) { if (0 == kpf::userId() || 0 == kpf::effectiveUserId()) { @@ -79,7 +79,7 @@ extern "C" configFile, KPanelApplet::Normal, KPanelApplet::About|KPanelApplet::Help, - tqparent, + parent, "kpf" ); } @@ -93,10 +93,10 @@ namespace KPF const TQString & configFile, Type type, int actions, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KPanelApplet (configFile, type, actions, tqparent, name), + : KPanelApplet (configFile, type, actions, parent, name), wizard_ (0L), popup_ (0L), dcopClient_ (0L) diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index f6eb7dd4..e5d3dc51 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -43,8 +43,8 @@ namespace KPF { - AppletItem::AppletItem(WebServer * server, TQWidget * tqparent) - : TQWidget (tqparent, "KPF::AppletItem"), + AppletItem::AppletItem(WebServer * server, TQWidget * parent) + : TQWidget (parent, "KPF::AppletItem"), server_ (server), configDialog_ (0L), monitorWindow_ (0L), diff --git a/kpf/src/AppletItem.h b/kpf/src/AppletItem.h index 6381555b..22b21337 100644 --- a/kpf/src/AppletItem.h +++ b/kpf/src/AppletItem.h @@ -54,7 +54,7 @@ namespace KPF * @param server The WebServer object which will be monitored and * controlled by this object. */ - AppletItem(WebServer * server, TQWidget * tqparent); + AppletItem(WebServer * server, TQWidget * parent); ~AppletItem(); diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index bc2f1ee8..546aa630 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -40,10 +40,10 @@ namespace KPF ( WebServer * server, OverlaySelect overlaySelect, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : TQWidget (tqparent, name, WRepaintNoErase), + : TQWidget (parent, name, WRepaintNoErase), server_ (server), max_ (0L), overlaySelect_ (overlaySelect) diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index ef72a3b8..8684c71f 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -62,7 +62,7 @@ namespace KPF ( WebServer * server, OverlaySelect overlaySelect, - TQWidget * tqparent = 0, + TQWidget * parent = 0, const char * name = 0 ); diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp index 12872a0a..657e96f0 100644 --- a/kpf/src/ConfigDialogPage.cpp +++ b/kpf/src/ConfigDialogPage.cpp @@ -43,8 +43,8 @@ namespace KPF { - ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * tqparent) - : TQWidget (tqparent, "KPF::ConfigDialogPage"), + ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * parent) + : TQWidget (parent, "KPF::ConfigDialogPage"), server_ (server), errorMessageConfigDialog_ (0L) { diff --git a/kpf/src/ConfigDialogPage.h b/kpf/src/ConfigDialogPage.h index aef03cca..df6ab985 100644 --- a/kpf/src/ConfigDialogPage.h +++ b/kpf/src/ConfigDialogPage.h @@ -48,7 +48,7 @@ namespace KPF public: - ConfigDialogPage(WebServer *, TQWidget * tqparent); + ConfigDialogPage(WebServer *, TQWidget * parent); virtual ~ConfigDialogPage(); diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp index 92b6ab0a..cda49a4a 100644 --- a/kpf/src/DirSelectWidget.cpp +++ b/kpf/src/DirSelectWidget.cpp @@ -39,10 +39,10 @@ namespace KPF DirSelectWidget::DirSelectWidget ( const TQString & pathToMakeVisible, - TQWidget * tqparent, + TQWidget * parent, const char * name ) - : KListView(tqparent, name) + : KListView(parent, name) { d = new Private; d->pathToMakeVisible = pathToMakeVisible; @@ -105,7 +105,7 @@ namespace KPF { TQString ret(item->text(0)); - while (0 != (item = item->tqparent())) + while (0 != (item = item->parent())) ret.prepend("/" + item->text(0)); return ret; diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp index 1d913146..e53941e7 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -42,11 +42,11 @@ namespace KPF ErrorMessageConfigDialog::ErrorMessageConfigDialog ( WebServer * webServer, - TQWidget * tqparent + TQWidget * parent ) : KDialogBase ( - tqparent, + parent, "ErrorMessageConfigDialog", false, i18n("Configure error messages"), diff --git a/kpf/src/ErrorMessageConfigDialog.h b/kpf/src/ErrorMessageConfigDialog.h index 3c43f940..d485de31 100644 --- a/kpf/src/ErrorMessageConfigDialog.h +++ b/kpf/src/ErrorMessageConfigDialog.h @@ -43,7 +43,7 @@ namespace KPF public: - ErrorMessageConfigDialog(WebServer *, TQWidget * tqparent); + ErrorMessageConfigDialog(WebServer *, TQWidget * parent); virtual ~ErrorMessageConfigDialog(); diff --git a/kpf/src/PortValidator.cpp b/kpf/src/PortValidator.cpp index 538cd3bf..b841377c 100644 --- a/kpf/src/PortValidator.cpp +++ b/kpf/src/PortValidator.cpp @@ -27,8 +27,8 @@ namespace KPF { - PortValidator::PortValidator(TQObject * tqparent, const char * name) - : TQValidator(tqparent, name) + PortValidator::PortValidator(TQObject * parent, const char * name) + : TQValidator(parent, name) { // Empty. } diff --git a/kpf/src/PortValidator.h b/kpf/src/PortValidator.h index c252c6a2..ca9a34e0 100644 --- a/kpf/src/PortValidator.h +++ b/kpf/src/PortValidator.h @@ -36,7 +36,7 @@ namespace KPF { public: - PortValidator(TQObject * tqparent, const char * name = 0); + PortValidator(TQObject * parent, const char * name = 0); virtual State validate(TQString & input, int & pos) const; }; diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 57f7c994..028697d3 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -273,9 +273,9 @@ namespace KPF } TQWidget * - PropertiesDialogPlugin::createInitWidget(TQWidget * tqparent) + PropertiesDialogPlugin::createInitWidget(TQWidget * parent) { - TQWidget * w = new TQWidget(tqparent); + TQWidget * w = new TQWidget(parent); TQLabel * about = new TQLabel @@ -316,9 +316,9 @@ namespace KPF } TQWidget * - PropertiesDialogPlugin::createConfigWidget(TQWidget * tqparent) + PropertiesDialogPlugin::createConfigWidget(TQWidget * parent) { - TQWidget * w = new TQWidget(tqparent); + TQWidget * w = new TQWidget(parent); d->cb_share = new TQCheckBox(i18n("Share this directory on the &Web"), w); diff --git a/kpf/src/PropertiesDialogPlugin.h b/kpf/src/PropertiesDialogPlugin.h index fc46b77d..8b19df31 100644 --- a/kpf/src/PropertiesDialogPlugin.h +++ b/kpf/src/PropertiesDialogPlugin.h @@ -65,8 +65,8 @@ namespace KPF void updateGUIFromCurrentState(); void updateWantedStateFromGUI(); - TQWidget * createInitWidget(TQWidget * tqparent); - TQWidget * createConfigWidget(TQWidget * tqparent); + TQWidget * createInitWidget(TQWidget * parent); + TQWidget * createConfigWidget(TQWidget * parent); void readSettings(); void setControlsEnabled(bool); diff --git a/kpf/src/RootValidator.cpp b/kpf/src/RootValidator.cpp index 6e0ec172..00fae54d 100644 --- a/kpf/src/RootValidator.cpp +++ b/kpf/src/RootValidator.cpp @@ -29,8 +29,8 @@ namespace KPF { - RootValidator::RootValidator(TQObject * tqparent, const char * name) - : TQValidator(tqparent, name) + RootValidator::RootValidator(TQObject * parent, const char * name) + : TQValidator(parent, name) { } diff --git a/kpf/src/RootValidator.h b/kpf/src/RootValidator.h index 05d02757..a5b5727a 100644 --- a/kpf/src/RootValidator.h +++ b/kpf/src/RootValidator.h @@ -36,7 +36,7 @@ namespace KPF { public: - RootValidator(TQObject * tqparent, const char * name = 0); + RootValidator(TQObject * parent, const char * name = 0); virtual State validate(TQString & input, int & pos) const; }; diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 62566b63..87d3c733 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -41,9 +41,9 @@ namespace KPF const TQString & dir, bool followSymlinks, int socket, - WebServer * tqparent + WebServer * parent ) - : TQObject(tqparent, "Server") + : TQObject(parent, "Server") { d = new Private; diff --git a/kpf/src/Server.h b/kpf/src/Server.h index 2e332801..97d75ed1 100644 --- a/kpf/src/Server.h +++ b/kpf/src/Server.h @@ -37,7 +37,7 @@ namespace KPF /** * Converses with a remote client. Handles requests and generates responses. - * Bandwidth is controlled by tqparent (WebServer). + * Bandwidth is controlled by parent (WebServer). */ class Server : public TQObject { @@ -61,14 +61,14 @@ namespace KPF * * @param socket The system's socket device, used for communication. * - * @param tqparent A WebServer, which will manage this Server. + * @param parent A WebServer, which will manage this Server. */ Server ( const TQString & dir, bool followSymlinks, int socket, - WebServer * tqparent + WebServer * parent ); /** diff --git a/kpf/src/ServerSocket.cpp b/kpf/src/ServerSocket.cpp index ffbab706..38d419a5 100644 --- a/kpf/src/ServerSocket.cpp +++ b/kpf/src/ServerSocket.cpp @@ -28,8 +28,8 @@ namespace KPF { - ServerSocket::ServerSocket(TQObject * tqparent, const char * name) - : TQSocket(tqparent, name) + ServerSocket::ServerSocket(TQObject * parent, const char * name) + : TQSocket(parent, name) { // Empty. } diff --git a/kpf/src/ServerSocket.h b/kpf/src/ServerSocket.h index 13016672..8dd7cc20 100644 --- a/kpf/src/ServerSocket.h +++ b/kpf/src/ServerSocket.h @@ -36,7 +36,7 @@ namespace KPF { public: - ServerSocket(TQObject * tqparent, const char * name = 0); + ServerSocket(TQObject * parent, const char * name = 0); uint outputBufferLeft(); }; diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index 214b6003..b48a2bf2 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -46,8 +46,8 @@ namespace KPF { - ServerWizard::ServerWizard(TQWidget * tqparent) - : KWizard(tqparent, "KPF::ServerWizard", true) + ServerWizard::ServerWizard(TQWidget * parent) + : KWizard(parent, "KPF::ServerWizard", true) { setCaption(i18n("New Server - %1").tqarg("kpf")); diff --git a/kpf/src/ServerWizard.h b/kpf/src/ServerWizard.h index de4896cf..f3c4a0c4 100644 --- a/kpf/src/ServerWizard.h +++ b/kpf/src/ServerWizard.h @@ -42,7 +42,7 @@ namespace KPF public: - ServerWizard(TQWidget * tqparent = 0); + ServerWizard(TQWidget * parent = 0); virtual ~ServerWizard(); diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp index f3a2c0eb..0dd907b3 100644 --- a/kpf/src/SingleServerConfigDialog.cpp +++ b/kpf/src/SingleServerConfigDialog.cpp @@ -33,11 +33,11 @@ namespace KPF SingleServerConfigDialog::SingleServerConfigDialog ( WebServer * server, - TQWidget * tqparent + TQWidget * parent ) : KDialogBase ( - tqparent, + parent, "KPF::SingleServerConfigDialog", false, i18n("Configuring Server %1 - kpf").tqarg(server->root()), diff --git a/kpf/src/SingleServerConfigDialog.h b/kpf/src/SingleServerConfigDialog.h index c5f6acc5..9e8d3dfe 100644 --- a/kpf/src/SingleServerConfigDialog.h +++ b/kpf/src/SingleServerConfigDialog.h @@ -41,7 +41,7 @@ namespace KPF public: - SingleServerConfigDialog(WebServer *, TQWidget * tqparent); + SingleServerConfigDialog(WebServer *, TQWidget * parent); virtual ~SingleServerConfigDialog(); diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp index 3daf1ec1..94709edc 100644 --- a/kpf/src/StartingKPFDialog.cpp +++ b/kpf/src/StartingKPFDialog.cpp @@ -47,11 +47,11 @@ namespace KPF TQTimer timer; }; - StartingKPFDialog::StartingKPFDialog(TQWidget * tqparent) + StartingKPFDialog::StartingKPFDialog(TQWidget * parent) : KDialogBase ( - tqparent, + parent, "StartingKPFDialog", true, /* modal */ i18n("Starting KDE public fileserver applet"), diff --git a/kpf/src/StartingKPFDialog.h b/kpf/src/StartingKPFDialog.h index 39571f60..a25fcda7 100644 --- a/kpf/src/StartingKPFDialog.h +++ b/kpf/src/StartingKPFDialog.h @@ -39,7 +39,7 @@ namespace KPF public: - StartingKPFDialog(TQWidget * tqparent); + StartingKPFDialog(TQWidget * parent); virtual ~StartingKPFDialog(); diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 6ee8ee45..2d7ab5d7 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -67,8 +67,8 @@ static TQString timet2qstring(time_t t) { // accounting is accomplished withing it's derived classes // ///////////////////////////////////////////////////////////////////////////// -AccountingBase::AccountingBase(TQObject *tqparent) : - TQObject(tqparent), +AccountingBase::AccountingBase(TQObject *parent) : + TQObject(parent), _total(0), _session(0) { @@ -212,8 +212,8 @@ TQString AccountingBase::getAccountingFile(const TQString &accountname) { // Accounting class for ruleset files // ///////////////////////////////////////////////////////////////////////////// -Accounting::Accounting(TQObject *tqparent, PPPStats *st) : - AccountingBase(tqparent), +Accounting::Accounting(TQObject *parent, PPPStats *st) : + AccountingBase(parent), acct_timer_id(0), update_timer_id(0), stats(st) @@ -358,8 +358,8 @@ double Accounting::session() const { -ExecutableAccounting::ExecutableAccounting(PPPStats *st, TQObject *tqparent) : - AccountingBase(tqparent), +ExecutableAccounting::ExecutableAccounting(PPPStats *st, TQObject *parent) : + AccountingBase(parent), proc(0), stats(st) { diff --git a/kppp/accounting.h b/kppp/accounting.h index 962d5d6a..020ca3e2 100644 --- a/kppp/accounting.h +++ b/kppp/accounting.h @@ -41,7 +41,7 @@ class AccountingBase : public TQObject { Q_OBJECT TQ_OBJECT public: - AccountingBase(TQObject *tqparent); + AccountingBase(TQObject *parent); virtual ~AccountingBase(); virtual double total() const; @@ -84,7 +84,7 @@ class Accounting : public AccountingBase { Q_OBJECT TQ_OBJECT public: - Accounting(TQObject *tqparent, PPPStats *st); + Accounting(TQObject *parent, PPPStats *st); virtual double total() const; virtual double session() const; @@ -122,7 +122,7 @@ class ExecutableAccounting : public AccountingBase { Q_OBJECT TQ_OBJECT public: - ExecutableAccounting(PPPStats *st, TQObject *tqparent = 0); + ExecutableAccounting(PPPStats *st, TQObject *parent = 0); virtual bool loadRuleSet(const TQString & ); virtual bool running() const; diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index eadace7e..fe1424e2 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -51,17 +51,17 @@ void parseargs(char* buf, char** args); -AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +AccountWidget::AccountWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { int min = 0; - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); - accountlist_l = new TQListBox(tqparent); + accountlist_l = new TQListBox(parent); accountlist_l->setMinimumSize(160, 128); connect(accountlist_l, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotListBoxSelect(int))); @@ -71,7 +71,7 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); - edit_b = new TQPushButton(i18n("&Edit..."), tqparent); + edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); @@ -81,13 +81,13 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) l111->addWidget(edit_b); - new_b = new TQPushButton(i18n("&New..."), tqparent); + new_b = new TQPushButton(i18n("&New..."), parent); connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newaccount())); l111->addWidget(new_b); TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n" "to the Internet")); - copy_b = new TQPushButton(i18n("Co&py"), tqparent); + copy_b = new TQPushButton(i18n("Co&py"), parent); connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copyaccount())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, @@ -96,7 +96,7 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) "to a new account that you can modify to fit your\n" "needs")); - delete_b = new TQPushButton(i18n("De&lete"), tqparent); + delete_b = new TQPushButton(i18n("De&lete"), parent); connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deleteaccount())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, @@ -110,11 +110,11 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l121 = new TQVBoxLayout; l12->addLayout(l121); l121->addStretch(1); - costlabel = new TQLabel(i18n("Phone costs:"), tqparent); + costlabel = new TQLabel(i18n("Phone costs:"), parent); costlabel->setEnabled(FALSE); l121->addWidget(costlabel); - costedit = new TQLineEdit(tqparent); + costedit = new TQLineEdit(parent); costedit->setFocusPolicy(TQ_NoFocus); costedit->setFixedHeight(costedit->tqsizeHint().height()); costedit->setEnabled(FALSE); @@ -129,11 +129,11 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) TQWhatsThis::add(costlabel, tmp); TQWhatsThis::add(costedit, tmp); - vollabel = new TQLabel(i18n("Volume:"), tqparent); + vollabel = new TQLabel(i18n("Volume:"), parent); vollabel->setEnabled(FALSE); l121->addWidget(vollabel); - voledit = new TQLineEdit(tqparent,"voledit"); + voledit = new TQLineEdit(parent,"voledit"); voledit->setFocusPolicy(TQ_NoFocus); voledit->setFixedHeight(voledit->tqsizeHint().height()); voledit->setEnabled(FALSE); @@ -153,13 +153,13 @@ AccountWidget::AccountWidget( TQWidget *tqparent, const char *name ) l12->addLayout(l122); l122->addStretch(1); - reset = new TQPushButton(i18n("&Reset..."), tqparent); + reset = new TQPushButton(i18n("&Reset..."), parent); reset->setEnabled(FALSE); connect(reset, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetClicked())); l122->addWidget(reset); - log = new TQPushButton(i18n("&View Logs"), tqparent); + log = new TQPushButton(i18n("&View Logs"), parent); connect(log, TQT_SIGNAL(clicked()), this, TQT_SLOT(viewLogClicked())); l122->addWidget(log); @@ -426,14 +426,14 @@ TQString AccountWidget::prettyPrintVolume(unsigned int n) { // Queries the user what to reset: costs, volume or both // ///////////////////////////////////////////////////////////////////////////// -QueryReset::QueryReset(TQWidget *tqparent) : TQDialog(tqparent, 0, true) { +QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); setCaption(i18n("Reset Accounting")); TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQVGroupBox *f = new TQVGroupBox(i18n("What to Reset"), this); - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); costs = new TQCheckBox(i18n("Reset the accumulated p&hone costs"), f); costs->setChecked(true); l1->addWidget(costs); diff --git a/kppp/accounts.h b/kppp/accounts.h index 61ba901d..6f8c1a28 100644 --- a/kppp/accounts.h +++ b/kppp/accounts.h @@ -46,7 +46,7 @@ class AccountWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - AccountWidget( TQWidget *tqparent=0, const char *name=0 ); + AccountWidget( TQWidget *parent=0, const char *name=0 ); ~AccountWidget() {} private slots: @@ -96,7 +96,7 @@ class QueryReset : public TQDialog { Q_OBJECT TQ_OBJECT public: - QueryReset(TQWidget *tqparent); + QueryReset(TQWidget *parent); enum {COSTS=1, VOLUME=2}; diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index fd456202..2a1ec1f8 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -52,25 +52,25 @@ #include "pppdata.h" -AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, const char *name) - : TQWidget(tqparent, name), +AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, const char *name) + : TQWidget(parent, name), isnewaccount(_isnewaccount) { - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); - enable_accounting = new TQCheckBox(i18n("&Enable accounting"), tqparent); + enable_accounting = new TQCheckBox(i18n("&Enable accounting"), parent); l1->addWidget(enable_accounting, 1); connect(enable_accounting, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableItems(bool))); // insert the tree widget - tl = new TQListView(tqparent, "treewidget"); + tl = new TQListView(parent, "treewidget"); connect(tl, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); tl->setMinimumSize(220, 200); l1->addWidget(tl, 1); - KURLLabel *up = new KURLLabel(tqparent); + KURLLabel *up = new KURLLabel(parent); up->setText(i18n("Check for rule updates")); up->setURL("http://developer.kde.org/~kppp/rules.html"); connect(up, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString&))); @@ -81,8 +81,8 @@ AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, c TQHBoxLayout *l11 = new TQHBoxLayout; l1->addSpacing(10); l1->addLayout(l11); - TQLabel *lsel = new TQLabel(i18n("Selected:"), tqparent); - selected = new TQLabel(tqparent); + TQLabel *lsel = new TQLabel(i18n("Selected:"), parent); + selected = new TQLabel(parent); selected->setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel); selected->setLineWidth(1); selected->setFixedHeight(selected->tqsizeHint().height() + 16); @@ -94,8 +94,8 @@ AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, c l1->addStretch(1); TQHBoxLayout *l12 = new TQHBoxLayout; l1->addLayout(l12); - TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), tqparent); - use_vol = new TQComboBox(tqparent); + TQLabel *usevol_l = new TQLabel(i18n("Volume accounting:"), parent); + use_vol = new TQComboBox(parent); use_vol->insertItem(i18n("No Accounting"), 0); use_vol->insertItem(i18n("Bytes In"), 1); use_vol->insertItem(i18n("Bytes Out"), 2); @@ -266,7 +266,7 @@ void AccountingSelector::setupTreeWidget() { // appropriate item if(!isnewaccount && edit_item) { tl->setSelected(edit_item, true); - tl->setOpen(edit_item->tqparent(), true); + tl->setOpen(edit_item->parent(), true); tl->ensureItemVisible(edit_item); } @@ -285,7 +285,7 @@ void AccountingSelector::enableItems(bool enabled) { TQString s; while(i) { s = "/" + i->text(0) + s; - i = i->tqparent(); + i = i->parent(); } selected->setText(s.mid(1)); diff --git a/kppp/acctselect.h b/kppp/acctselect.h index 5f93b44e..a4c396cd 100644 --- a/kppp/acctselect.h +++ b/kppp/acctselect.h @@ -49,7 +49,7 @@ class AccountingSelector : public TQWidget { Q_OBJECT TQ_OBJECT public: - AccountingSelector(TQWidget *tqparent = 0, bool _isnewaccount = false, const char *name = 0); + AccountingSelector(TQWidget *parent = 0, bool _isnewaccount = false, const char *name = 0); ~AccountingSelector() {} bool save(); diff --git a/kppp/connect.cpp b/kppp/connect.cpp index b02da8db..ea755a3e 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -78,8 +78,8 @@ TQString old_hostname; bool modified_hostname; -ConnectWidget::ConnectWidget(TQWidget *tqparent, const char *name, PPPStats *st) - : TQWidget(tqparent, name), +ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) + : TQWidget(parent, name), // initialize some important variables myreadbuffer(""), main_timer_ID(0), @@ -1271,8 +1271,8 @@ bool ConnectWidget::execppp() { command += gpppdata.gateway(); } - if(gpppdata.subnettqmask() != "0.0.0.0") - command += " nettqmask " + gpppdata.subnettqmask(); + if(gpppdata.subnetmask() != "0.0.0.0") + command += " netmask " + gpppdata.subnetmask(); // the english/i18n mix below is ugly but we want to keep working // after someone changed the code to use i18n'ed config values diff --git a/kppp/connect.h b/kppp/connect.h index 8f46ce8b..bb43619b 100644 --- a/kppp/connect.h +++ b/kppp/connect.h @@ -47,7 +47,7 @@ class ConnectWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ConnectWidget(TQWidget *tqparent, const char *name, PPPStats *st); + ConnectWidget(TQWidget *parent, const char *name, PPPStats *st); ~ConnectWidget(); public: diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 3a20bbee..14154e69 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -31,9 +31,9 @@ extern PPPData gpppdata; -ConWindow::ConWindow(TQWidget *tqparent, const char *name,TQWidget *mainwidget, +ConWindow::ConWindow(TQWidget *parent, const char *name,TQWidget *mainwidget, PPPStats *st) - : TQWidget(tqparent, name, 0), + : TQWidget(parent, name, 0), minutes(0), seconds(0), hours(0), diff --git a/kppp/conwindow.h b/kppp/conwindow.h index e7fed7f5..a1d13f09 100644 --- a/kppp/conwindow.h +++ b/kppp/conwindow.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - ConWindow(TQWidget *tqparent, const char *name,TQWidget *main, PPPStats *st); + ConWindow(TQWidget *parent, const char *name,TQWidget *main, PPPStats *st); ~ConWindow(); protected: diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 914ce940..9b220c20 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -29,8 +29,8 @@ extern KPPPWidget *p_kppp; -myMultiEdit::myMultiEdit(TQWidget *tqparent, const char *name) - : TQMultiLineEdit(tqparent, name) +myMultiEdit::myMultiEdit(TQWidget *parent, const char *name) + : TQMultiLineEdit(parent, name) { setReadOnly(true); } @@ -45,8 +45,8 @@ void myMultiEdit::newLine() { } -DebugWidget::DebugWidget(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, FALSE) +DebugWidget::DebugWidget(TQWidget *parent, const char *name) + : TQDialog(parent, name, FALSE) { setCaption(i18n("Login Script Debug Window")); diff --git a/kppp/debug.h b/kppp/debug.h index bc939dde..b5d02aeb 100644 --- a/kppp/debug.h +++ b/kppp/debug.h @@ -34,7 +34,7 @@ class myMultiEdit : public TQMultiLineEdit { public: - myMultiEdit(TQWidget *tqparent=0, const char *name=0); + myMultiEdit(TQWidget *parent=0, const char *name=0); void newLine(); void insertChar(unsigned char c); @@ -45,7 +45,7 @@ class DebugWidget : public TQDialog { Q_OBJECT TQ_OBJECT public: - DebugWidget(TQWidget *tqparent=0, const char *name=0); + DebugWidget(TQWidget *parent=0, const char *name=0); void clear(); diff --git a/kppp/docking.cpp b/kppp/docking.cpp index efe81924..eb544668 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -38,8 +38,8 @@ extern KPPPWidget *p_kppp; // static member DockWidget *DockWidget::dock_widget = 0; -DockWidget::DockWidget(TQWidget *tqparent, const char *name, PPPStats *st) - : KSystemTray(tqparent, name), stats(st) { +DockWidget::DockWidget(TQWidget *parent, const char *name, PPPStats *st) + : KSystemTray(parent, name), stats(st) { // load pixmaps dock_none_pixmap = UserIcon("dock_none"); diff --git a/kppp/docking.h b/kppp/docking.h index bb1e8139..5d3b398b 100644 --- a/kppp/docking.h +++ b/kppp/docking.h @@ -37,7 +37,7 @@ class DockWidget : public KSystemTray { Q_OBJECT TQ_OBJECT public: - DockWidget(TQWidget * tqparent, const char *name, PPPStats *st); + DockWidget(TQWidget * parent, const char *name, PPPStats *st); ~DockWidget(); protected: diff --git a/kppp/edit.cpp b/kppp/edit.cpp index fb1156be..ef2eaa10 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -44,17 +44,17 @@ #include "iplined.h" #include "auth.h" -DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { const int GRIDROWS = 8; - TQGridLayout *tl = new TQGridLayout(tqparent, GRIDROWS, 2, 0, KDialog::spacingHint()); + TQGridLayout *tl = new TQGridLayout(parent, GRIDROWS, 2, 0, KDialog::spacingHint()); - connect_label = new TQLabel(i18n("Connection &name:"), tqparent); + connect_label = new TQLabel(i18n("Connection &name:"), parent); tl->addWidget(connect_label, 0, 0); - connectname_l = new TQLineEdit(tqparent); + connectname_l = new TQLineEdit(parent); connectname_l->setMaxLength(ACCNAME_SIZE); connect_label->setBuddy(connectname_l); @@ -65,24 +65,24 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(connectname_l,tmp); - number_label = new TQLabel(i18n("P&hone number:"), tqparent); + number_label = new TQLabel(i18n("P&hone number:"), parent); number_label->tqsetAlignment(AlignTop|AlignLeft); tl->addWidget(number_label, 1, 0); TQHBoxLayout *lpn = new TQHBoxLayout(5); tl->addLayout(lpn, 1, 1); - numbers = new TQListBox(tqparent); + numbers = new TQListBox(parent); number_label->setBuddy(numbers); numbers->setMinimumSize(120, 70); lpn->addWidget(numbers); TQVBoxLayout *lpn1 = new TQVBoxLayout; lpn->addLayout(lpn1); - add = new TQPushButton(i18n("&Add..."), tqparent); - del = new TQPushButton(i18n("&Remove"), tqparent); + add = new TQPushButton(i18n("&Add..."), parent); + del = new TQPushButton(i18n("&Remove"), parent); - up = new TQPushButton(tqparent); + up = new TQPushButton(parent); up->setIconSet(BarIconSet("up")); - down = new TQPushButton(tqparent); + down = new TQPushButton(parent); down->setIconSet(BarIconSet("down")); lpn1->addWidget(add); lpn1->addWidget(del); @@ -112,10 +112,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(number_label,tmp); TQWhatsThis::add(numbers,tmp); - auth_l = new TQLabel(i18n("A&uthentication:"), tqparent); + auth_l = new TQLabel(i18n("A&uthentication:"), parent); tl->addWidget(auth_l, 3, 0); - auth = new TQComboBox(tqparent); + auth = new TQComboBox(parent); auth_l->setBuddy(auth); auth->insertItem(i18n("Script-based")); auth->insertItem(i18n("PAP")); @@ -136,7 +136,7 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(auth_l,tmp); TQWhatsThis::add(auth,tmp); - store_password = new TQCheckBox(i18n("Store &password"), tqparent); + store_password = new TQCheckBox(i18n("Store &password"), parent); store_password->setChecked(true); tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight); TQWhatsThis::add(store_password, @@ -149,10 +149,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name "readable only to you. Make sure nobody\n" "gains access to this file!")); - cbtype_l = new TQLabel(i18n("&Callback type:"), tqparent); + cbtype_l = new TQLabel(i18n("&Callback type:"), parent); tl->addWidget(cbtype_l, 5, 0); - cbtype = new TQComboBox(tqparent); + cbtype = new TQComboBox(parent); cbtype_l->setBuddy(cbtype); cbtype->insertItem(i18n("None")); cbtype->insertItem(i18n("Administrator-defined")); @@ -165,10 +165,10 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(cbtype_l,tmp); TQWhatsThis::add(cbtype,tmp); - cbphone_l = new TQLabel(i18n("Call&back number:"), tqparent); + cbphone_l = new TQLabel(i18n("Call&back number:"), parent); tl->addWidget(cbphone_l, 6, 0); - cbphone = new TQLineEdit(tqparent); + cbphone = new TQLineEdit(parent); cbphone_l->setBuddy(cbphone); cbphone->setMaxLength(140); tl->addWidget(cbphone, 6, 1); @@ -177,7 +177,7 @@ DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name TQWhatsThis::add(cbphone_l,tmp); TQWhatsThis::add(cbphone,tmp); - pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), tqparent); + pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), parent); connect(pppdargs, TQT_SIGNAL(clicked()), TQT_SLOT(pppdargsbutton())); tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, AlignCenter); @@ -312,10 +312,10 @@ void DialWidget::pppdargsbutton() { ///////////////////////////////////////////////////////////////////////////// // ExecWidget ///////////////////////////////////////////////////////////////////////////// -ExecWidget::ExecWidget(TQWidget *tqparent, bool isnewaccount, const char *name) : - TQWidget(tqparent, name) +ExecWidget::ExecWidget(TQWidget *parent, bool isnewaccount, const char *name) : + TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); TQLabel *l = new TQLabel(\ i18n("Here you can select commands to run at certain stages of the\n" @@ -323,7 +323,7 @@ i18n("Here you can select commands to run at certain stages of the\n" "you cannot run any commands here requiring root permissions\n" "(unless, of course, you are root).\n\n" "Be sure to supply the whole path to the program otherwise\n" - "kppp might be unable to find it."), tqparent); + "kppp might be unable to find it."), parent); l->setMinimumHeight(l->tqsizeHint().height()); tl->addWidget(l); tl->addStretch(1); @@ -333,10 +333,10 @@ i18n("Here you can select commands to run at certain stages of the\n" l1->setColStretch(0, 0); l1->setColStretch(1, 1); - before_connect_l = new TQLabel(i18n("&Before connect:"), tqparent); + before_connect_l = new TQLabel(i18n("&Before connect:"), parent); before_connect_l->tqsetAlignment(AlignVCenter); l1->addWidget(before_connect_l, 0, 0); - before_connect = new TQLineEdit(tqparent); + before_connect = new TQLineEdit(parent); before_connect_l->setBuddy(before_connect); before_connect->setMaxLength(COMMAND_SIZE); l1->addWidget(before_connect, 0, 1); @@ -349,10 +349,10 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(before_connect_l,tmp); TQWhatsThis::add(before_connect,tmp); - command_label = new TQLabel(i18n("&Upon connect:"), tqparent); + command_label = new TQLabel(i18n("&Upon connect:"), parent); command_label->tqsetAlignment(AlignVCenter); l1->addWidget(command_label, 1, 0); - command = new TQLineEdit(tqparent); + command = new TQLineEdit(parent); command_label->setBuddy(command); command->setMaxLength(COMMAND_SIZE); l1->addWidget(command, 1, 1); @@ -366,10 +366,10 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(command,tmp); predisconnect_label = new TQLabel(i18n("Before &disconnect:"), - tqparent); + parent); predisconnect_label->tqsetAlignment(AlignVCenter); l1->addWidget(predisconnect_label, 2, 0); - predisconnect = new TQLineEdit(tqparent); + predisconnect = new TQLineEdit(parent); predisconnect_label->setBuddy(predisconnect); predisconnect->setMaxLength(COMMAND_SIZE); l1->addWidget(predisconnect, 2, 1); @@ -381,11 +381,11 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(predisconnect,tmp); discommand_label = new TQLabel(i18n("U&pon disconnect:"), - tqparent); + parent); discommand_label->tqsetAlignment(AlignVCenter); l1->addWidget(discommand_label, 3, 0); - discommand = new TQLineEdit(tqparent); + discommand = new TQLineEdit(parent); discommand_label->setBuddy(discommand); discommand->setMaxLength(COMMAND_SIZE); l1->addWidget(discommand, 3, 1); @@ -427,16 +427,16 @@ bool ExecWidget::save() { // IPWidget // ///////////////////////////////////////////////////////////////////////////// -IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *topLayout = new TQVBoxLayout(parent); topLayout->setSpacing(KDialog::spacingHint()); - box = new TQVGroupBox(i18n("C&onfiguration"), tqparent); + box = new TQVGroupBox(i18n("C&onfiguration"), parent); box->setInsideSpacing(KDialog::spacingHint()); - rb = new TQButtonGroup(tqparent); + rb = new TQButtonGroup(parent); rb->hide(); connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitIPSelect(int))); @@ -478,10 +478,10 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(ipaddress_label,tmp); TQWhatsThis::add(ipaddress_l,tmp); - sub_label = new TQLabel(i18n("&Subnet tqmask:"), ipWidget); + sub_label = new TQLabel(i18n("&Subnet mask:"), ipWidget); tmp = i18n("<p>If your computer has a static Internet address,\n" - "you must supply a network tqmask here. In almost\n" - "all cases this nettqmask will be <b>255.255.255.0</b>,\n" + "you must supply a network mask here. In almost\n" + "all cases this netmask will be <b>255.255.255.0</b>,\n" "but your mileage may vary.\n" "\n" "If unsure, contact your Internet Service Provider"); @@ -494,7 +494,7 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(sub_label,tmp); TQWhatsThis::add(subnetmask_l,tmp); - autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent); + autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), parent); autoname->setChecked(gpppdata.autoname()); connect(autoname,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(autoname_t(bool))); @@ -516,14 +516,14 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) //load info from gpppdata if(!isnewaccount) { if(gpppdata.ipaddr() == "0.0.0.0" && - gpppdata.subnettqmask() == "0.0.0.0") { + gpppdata.subnetmask() == "0.0.0.0") { dynamicadd_rb->setChecked(true); hitIPSelect(0); autoname->setChecked(gpppdata.autoname()); } else { ipaddress_l->setText(gpppdata.ipaddr()); - subnetmask_l->setText(gpppdata.subnettqmask()); + subnetmask_l->setText(gpppdata.subnetmask()); staticadd_rb->setChecked(true); autoname->setChecked(false); } @@ -557,10 +557,10 @@ void IPWidget::autoname_t(bool on) { void IPWidget::save() { if(dynamicadd_rb->isChecked()) { gpppdata.setIpaddr("0.0.0.0"); - gpppdata.setSubnettqmask("0.0.0.0"); + gpppdata.setSubnetmask("0.0.0.0"); } else { gpppdata.setIpaddr(ipaddress_l->text()); - gpppdata.setSubnettqmask(subnetmask_l->text()); + gpppdata.setSubnetmask(subnetmask_l->text()); } gpppdata.setAutoname(autoname->isChecked()); } @@ -583,16 +583,16 @@ void IPWidget::hitIPSelect( int i ) { -DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - // box = new TQGroupBox(tqparent); - TQGridLayout *tl = new TQGridLayout(tqparent, 7, 2, 0, KDialog::spacingHint()); + // box = new TQGroupBox(parent); + TQGridLayout *tl = new TQGridLayout(parent, 7, 2, 0, KDialog::spacingHint()); - dnsdomain_label = new TQLabel(i18n("Domain &name:"), tqparent); + dnsdomain_label = new TQLabel(i18n("Domain &name:"), parent); tl->addWidget(dnsdomain_label, 0, 0); - dnsdomain = new TQLineEdit(tqparent); + dnsdomain = new TQLineEdit(parent); dnsdomain_label->setBuddy(dnsdomain); dnsdomain->setMaxLength(DOMAIN_SIZE); tl->addWidget(dnsdomain, 0, 1); @@ -608,7 +608,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQWhatsThis::add(dnsdomain_label,tmp); TQWhatsThis::add(dnsdomain,tmp); - conf_label = new TQLabel(i18n("C&onfiguration:"), tqparent); + conf_label = new TQLabel(i18n("C&onfiguration:"), parent); tl->addWidget(conf_label, 1, 0); bg = new TQButtonGroup("Group", this); @@ -616,23 +616,23 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(DNS_Mode_Selected(int))); bg->hide(); - autodns = new TQRadioButton(i18n("Automatic"), tqparent); + autodns = new TQRadioButton(i18n("Automatic"), parent); bg->insert(autodns, 0); tl->addWidget(autodns, 1, 1); // no automatic DNS detection for pppd < 2.3.7 if(!gpppdata.pppdVersionMin(2, 3, 7)) autodns->setEnabled(false); - mandns = new TQRadioButton(i18n("Manual"), tqparent); + mandns = new TQRadioButton(i18n("Manual"), parent); bg->insert(mandns, 1); tl->addWidget(mandns, 2, 1); - dns_label = new TQLabel(i18n("DNS &IP address:"), tqparent); + dns_label = new TQLabel(i18n("DNS &IP address:"), parent); tl->addWidget(dns_label, 3, 0); TQHBoxLayout *l2 = new TQHBoxLayout; tl->addLayout(l2, 3, 1); - dnsipaddr = new IPLineEdit(tqparent); + dnsipaddr = new IPLineEdit(parent); dns_label->setBuddy(dnsipaddr); connect(dnsipaddr, TQT_SIGNAL(returnPressed()), TQT_SLOT(adddns())); @@ -653,7 +653,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1, 4, 1); - add = new TQPushButton(i18n("&Add"), tqparent); + add = new TQPushButton(i18n("&Add"), parent); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns())); int width = add->tqsizeHint().width(); width = TQMAX(width,60); @@ -665,7 +665,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) "specified in the field above. The entry\n" "will then be added to the list below")); - remove = new TQPushButton(i18n("&Remove"), tqparent); + remove = new TQPushButton(i18n("&Remove"), parent); connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns())); width = remove->tqsizeHint().width(); width = TQMAX(width,60); @@ -675,11 +675,11 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) i18n("Click this button to remove the selected DNS\n" "server entry from the list below")); - servers_label = new TQLabel(i18n("DNS address &list:"), tqparent); + servers_label = new TQLabel(i18n("DNS address &list:"), parent); servers_label->tqsetAlignment(AlignTop|AlignLeft); tl->addWidget(servers_label, 5, 0); - dnsservers = new TQListBox(tqparent); + dnsservers = new TQListBox(parent); servers_label->setBuddy(dnsservers); dnsservers->setMinimumSize(150, 80); connect(dnsservers, TQT_SIGNAL(highlighted(int)), @@ -694,7 +694,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) exdnsdisabled_toggle = new TQCheckBox(i18n( \ "&Disable existing DNS servers during connection"), - tqparent); + parent); exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled()); tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter); TQWhatsThis::add(exdnsdisabled_toggle, @@ -782,16 +782,16 @@ void DNSWidget::removedns() { // // GatewayWidget // -GatewayWidget::GatewayWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *topLayout = new TQVBoxLayout(parent); topLayout->setSpacing(KDialog::spacingHint()); - box = new TQVGroupBox(i18n("C&onfiguration"), tqparent); + box = new TQVGroupBox(i18n("C&onfiguration"), parent); box->setInsideSpacing(KDialog::spacingHint()); - rb = new TQButtonGroup(tqparent); + rb = new TQButtonGroup(parent); rb->hide(); connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitGatewaySelect(int))); @@ -822,7 +822,7 @@ GatewayWidget::GatewayWidget( TQWidget *tqparent, bool isnewaccount, const char gate_label->setBuddy(gatewayaddr); defaultroute = new TQCheckBox(i18n("&Assign the default route to this gateway"), - tqparent); + parent); TQWhatsThis::add(defaultroute, i18n("If this option is enabled, all packets not\n" "going to the local net are routed through\n" @@ -874,16 +874,16 @@ void GatewayWidget::hitGatewaySelect( int i ) { -ScriptWidget::ScriptWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) - : TQWidget(tqparent, name) +ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *name ) + : TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); - se = new ScriptEdit(tqparent); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); + se = new ScriptEdit(parent); connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(addButton())); tl->addWidget(se); // insert equal-sized buttons - KButtonBox *bbox = new KButtonBox(tqparent); + KButtonBox *bbox = new KButtonBox(parent); add = bbox->addButton(i18n("&Add")); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addButton())); bbox->addStretch(1); @@ -897,17 +897,17 @@ ScriptWidget::ScriptWidget( TQWidget *tqparent, bool isnewaccount, const char *n TQHBoxLayout *l12 = new TQHBoxLayout(0); tl->addLayout(l12); - stl = new TQListBox(tqparent); + stl = new TQListBox(parent); stl->setVScrollBarMode( TQScrollView::AlwaysOff ); connect(stl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(stlhighlighted(int))); stl->setMinimumSize(TQSize(70, 140)); - sl = new TQListBox(tqparent); + sl = new TQListBox(parent); sl->setVScrollBarMode( TQScrollView::AlwaysOff ); connect(sl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slhighlighted(int))); sl->setMinimumSize(TQSize(150, 140)); - slb = new TQScrollBar(tqparent); + slb = new TQScrollBar(parent); slb->setFixedWidth(slb->tqsizeHint().width()); connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int))); @@ -1201,7 +1201,7 @@ void ScriptWidget::removeButton() { // Used to specify a new phone number // ///////////////////////////////////////////////////////////////////////////// -PhoneNumberDialog::PhoneNumberDialog(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Add Phone Number"), Ok|Cancel) { +PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Add Phone Number"), Ok|Cancel) { KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); TQHBox *hbox = new TQHBox(this); diff --git a/kppp/edit.h b/kppp/edit.h index 3bf7fdb1..9697442e 100644 --- a/kppp/edit.h +++ b/kppp/edit.h @@ -51,7 +51,7 @@ class DialWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - DialWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + DialWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DialWidget() {} public slots: @@ -94,7 +94,7 @@ class ExecWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ExecWidget(TQWidget *tqparent=0, bool isnewaccount=true, const char *name=0); + ExecWidget(TQWidget *parent=0, bool isnewaccount=true, const char *name=0); public slots: bool save(); @@ -118,7 +118,7 @@ class IPWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - IPWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + IPWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~IPWidget() {} public slots: @@ -149,7 +149,7 @@ class DNSWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - DNSWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + DNSWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~DNSWidget() {} public slots: @@ -182,7 +182,7 @@ class GatewayWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - GatewayWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + GatewayWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~GatewayWidget() {} public slots: @@ -207,7 +207,7 @@ class ScriptWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ScriptWidget( TQWidget *tqparent=0, bool isnewaccount = true, const char *name=0 ); + ScriptWidget( TQWidget *parent=0, bool isnewaccount = true, const char *name=0 ); ~ScriptWidget() {} public slots: @@ -248,7 +248,7 @@ class PhoneNumberDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - PhoneNumberDialog(TQWidget *tqparent = 0); + PhoneNumberDialog(TQWidget *parent = 0); TQString phoneNumber(); diff --git a/kppp/general.cpp b/kppp/general.cpp index 49981474..5ed9c459 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -46,23 +46,23 @@ // Widget containing misc. configuration options // ///////////////////////////////////////////////////////////////////////////// -GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) + : TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); TQHBoxLayout *hbox = new TQHBoxLayout(tl); TQLabel *label; - label = new TQLabel(i18n("pppd version:"), tqparent); + label = new TQLabel(i18n("pppd version:"), parent); hbox->addWidget(label); TQString version = gpppdata.pppdVersion(); if(version == "0.0.0") version = "unknown"; - label = new TQLabel(version, tqparent); + label = new TQLabel(version, parent); label->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); hbox->addWidget(label); - KIntNumInput *pppdTimeout = new KIntNumInput(gpppdata.pppdTimeout(), tqparent); + KIntNumInput *pppdTimeout = new KIntNumInput(gpppdata.pppdTimeout(), parent); pppdTimeout->setLabel(i18n("pppd &timeout:")); pppdTimeout->setRange(1, TIMEOUT_SIZE, 5, true); pppdTimeout->setSuffix(i18n(" sec")); @@ -79,7 +79,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) tl->addSpacing(10); TQCheckBox *chkBox; - chkBox = new TQCheckBox(i18n("Doc&k into panel on connect"), tqparent); + chkBox = new TQCheckBox(i18n("Doc&k into panel on connect"), parent); TQWhatsThis::add(chkBox, i18n("<p>After a connection is established, the\n" "window is minimized and a small icon\n" @@ -94,7 +94,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) this, TQT_SLOT(docking_toggled(bool))); tl->addWidget(chkBox); - chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), tqparent); + chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), parent); chkBox->setChecked(gpppdata.automatic_redial()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(redial_toggled(bool))); @@ -106,7 +106,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "\n" "See <a href=\"#redial\">here</a> for more on this topic.")); - chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), tqparent); + chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), parent); chkBox->setChecked(gpppdata.get_redial_on_nocarrier()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(nocarrier_toggled(bool))); @@ -117,7 +117,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "instead of waiting for user to click <CANCEL>\n" "button.")); - chkBox = new TQCheckBox(i18n("&Show clock on caption"), tqparent); + chkBox = new TQCheckBox(i18n("&Show clock on caption"), parent); chkBox->setChecked(gpppdata.get_show_clock_on_caption()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(caption_toggled(bool))); @@ -128,7 +128,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "was established. Very useful, so you \n" "should turn this on")); - chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), tqparent); + chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), parent); chkBox->setChecked(gpppdata.get_xserver_exit_disconnect()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(xserver_toggled(bool))); @@ -141,7 +141,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) "\n" "See <a href=\"#disxserver\">here</a> for more on this.")); - chkBox = new TQCheckBox(i18n("&Quit on disconnect"), tqparent); + chkBox = new TQCheckBox(i18n("&Quit on disconnect"), parent); chkBox->setChecked(gpppdata.quit_on_disconnect()); connect(chkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(quit_toggled(bool))); @@ -150,7 +150,7 @@ GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name) i18n("When this option is turned on, <i>kppp</i>\n" "will be closed when you disconnect")); - chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), tqparent); + chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), parent); chkBox->setChecked(gpppdata.get_iconify_on_connect()); connect(chkBox,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(iconify_toggled(bool))); @@ -203,15 +203,15 @@ void GeneralWidget::pppdtimeoutchanged(int n) { } -ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) - : TQWidget(tqparent, name) +ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) + : TQWidget(parent, name) { - TQGridLayout *tl = new TQGridLayout(tqparent, 9, 2, 0, KDialog::spacingHint()); + TQGridLayout *tl = new TQGridLayout(parent, 9, 2, 0, KDialog::spacingHint()); - connect_label = new TQLabel(i18n("Modem &name:"), tqparent); + connect_label = new TQLabel(i18n("Modem &name:"), parent); tl->addWidget(connect_label, 0, 0); - connectname_l = new TQLineEdit(tqparent); + connectname_l = new TQLineEdit(parent); connectname_l->setMaxLength(ACCNAME_SIZE); connect_label->setBuddy(connectname_l); @@ -221,10 +221,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(connect_label,tmp); TQWhatsThis::add(connectname_l,tmp); - label1 = new TQLabel(i18n("Modem de&vice:"), tqparent); + label1 = new TQLabel(i18n("Modem de&vice:"), parent); tl->addWidget(label1, 1, 0); - modemdevice = new TQComboBox(false, tqparent); + modemdevice = new TQComboBox(false, parent); label1->setBuddy(modemdevice); // ### deviceExist mechanism not functional right now bool deviceExist = false; @@ -252,10 +252,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(modemdevice,tmp); - label2 = new TQLabel(i18n("&Flow control:"), tqparent); + label2 = new TQLabel(i18n("&Flow control:"), parent); tl->addWidget(label2, 2, 0); - flowcontrol = new TQComboBox(false, tqparent); + flowcontrol = new TQComboBox(false, parent); label2->setBuddy(flowcontrol); flowcontrol->insertItem(i18n("Hardware [CRTSCTS]")); // sync with pppdata.cpp flowcontrol->insertItem(i18n("Software [XON/XOFF]")); @@ -278,10 +278,10 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(label2,tmp); TQWhatsThis::add(flowcontrol,tmp); - labelenter = new TQLabel(i18n("&Line termination:"), tqparent); + labelenter = new TQLabel(i18n("&Line termination:"), parent); tl->addWidget(labelenter, 3, 0); - enter = new TQComboBox(false, tqparent); + enter = new TQComboBox(false, parent); labelenter->setBuddy(enter); enter->insertItem("CR"); enter->insertItem("LF"); @@ -299,9 +299,9 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) TQWhatsThis::add(labelenter,tmp); TQWhatsThis::add(enter, tmp); - baud_label = new TQLabel(i18n("Co&nnection speed:"), tqparent); + baud_label = new TQLabel(i18n("Co&nnection speed:"), parent); tl->addWidget(baud_label, 4, 0); - baud_c = new TQComboBox(tqparent); + baud_c = new TQComboBox(parent); baud_label->setBuddy(baud_c); static const char *baudrates[] = { @@ -358,7 +358,7 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) tl->addRowSpacing(4, 10); //Modem Lock File - modemlockfile = new TQCheckBox(i18n("&Use lock file"), tqparent); + modemlockfile = new TQCheckBox(i18n("&Use lock file"), parent); modemlockfile->setChecked(gpppdata.modemLockFile()); /* connect(modemlockfile, TQT_SIGNAL(toggled(bool)), @@ -378,7 +378,7 @@ ModemWidget::ModemWidget(TQWidget *tqparent, bool isnewmodem, const char *name) // Modem Timeout Line Edit Box - modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), tqparent); + modemtimeout = new KIntNumInput(gpppdata.modemTimeout(), parent); modemtimeout->setLabel(i18n("Modem &timeout:")); modemtimeout->setRange(1, 120, 1); modemtimeout->setSuffix(i18n(" sec")); @@ -445,13 +445,13 @@ bool ModemWidget::save() } -ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); - waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), tqparent); + waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), parent); waitfordt->setChecked(gpppdata.waitForDialTone()); // connect(waitfordt, TQT_SIGNAL(toggled(bool)), TQT_SLOT(waitfordtchanged(bool))); l1->addWidget(waitfordt); @@ -464,7 +464,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "\n" "<b>Default:</b>: On")); - busywait = new KIntNumInput(gpppdata.busyWait(), tqparent); + busywait = new KIntNumInput(gpppdata.busyWait(), parent); busywait->setLabel(i18n("B&usy wait:")); busywait->setRange(0, 300, 5, true); busywait->setSuffix(i18n(" sec")); @@ -485,9 +485,9 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) TQHBoxLayout *hbl = new TQHBoxLayout; hbl->setSpacing(KDialog::spacingHint()); - TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), tqparent); + TQLabel *volumeLabel = new TQLabel(i18n("Modem &volume:"), parent); hbl->addWidget(volumeLabel); - volume = new TQSlider(0, 2, 1, gpppdata.volume(), Qt::Horizontal, tqparent); + volume = new TQSlider(0, 2, 1, gpppdata.volume(), Qt::Horizontal, parent); volumeLabel->setBuddy(volume); volume->setTickmarks(TQSlider::Below); hbl->addWidget(volume); @@ -510,7 +510,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) l1->addSpacing(20); #if 0 - chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), tqparent); + chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), parent); chkbox1->setChecked(gpppdata.UseCDLine()); connect(chkbox1,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(use_cdline_toggled(bool))); @@ -525,12 +525,12 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "<b>Default</b>: Off")); #endif - modemcmds = new TQPushButton(i18n("Mod&em Commands..."), tqparent); + modemcmds = new TQPushButton(i18n("Mod&em Commands..."), parent); TQWhatsThis::add(modemcmds, i18n("Allows you to change the AT command for\n" "your modem.")); - modeminfo_button = new TQPushButton(i18n("&Query Modem..."), tqparent); + modeminfo_button = new TQPushButton(i18n("&Query Modem..."), parent); TQWhatsThis::add(modeminfo_button, i18n("Most modems support the ATI command set to\n" "find out vendor and revision of your modem.\n" @@ -539,7 +539,7 @@ ModemWidget2::ModemWidget2(TQWidget *tqparent, const char *name) "this information. It can be useful to help\n" "you set up the modem")); - terminal_button = new TQPushButton(i18n("&Terminal..."), tqparent); + terminal_button = new TQPushButton(i18n("&Terminal..."), parent); TQWhatsThis::add(terminal_button, i18n("Opens the built-in terminal program. You\n" "can use this if you want to play around\n" @@ -607,20 +607,20 @@ bool ModemWidget2::save() // Setup widget for the graph // ///////////////////////////////////////////////////////////////////////////// -GraphSetup::GraphSetup(TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name) +GraphSetup::GraphSetup(TQWidget *parent, const char *name) : + TQWidget(parent, name) { - TQVBoxLayout *tl = new TQVBoxLayout(tqparent); + TQVBoxLayout *tl = new TQVBoxLayout(parent); bool enable; TQColor bg, text, in, out; gpppdata.graphingOptions(enable, bg, text, in, out); - enable_check = new TQCheckBox(i18n("&Enable throughput graph"), tqparent); + enable_check = new TQCheckBox(i18n("&Enable throughput graph"), parent); tl->addWidget(enable_check); grpColor = new TQGroupBox(2, Qt::Horizontal, - i18n("Graph Colors"), tqparent); + i18n("Graph Colors"), parent); tl->addWidget(grpColor); TQLabel *label; diff --git a/kppp/general.h b/kppp/general.h index 543d6588..de9c711e 100644 --- a/kppp/general.h +++ b/kppp/general.h @@ -41,7 +41,7 @@ class GeneralWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - GeneralWidget( TQWidget *tqparent=0, const char *name=0 ); + GeneralWidget( TQWidget *parent=0, const char *name=0 ); private slots: void pppdtimeoutchanged(int); @@ -60,7 +60,7 @@ class ModemWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemWidget(TQWidget *tqparent=0, bool isnewmodem=true, const char *name=0); + ModemWidget(TQWidget *parent=0, bool isnewmodem=true, const char *name=0); bool save(); TQLineEdit *connectName() { return connectname_l;} private slots: @@ -90,7 +90,7 @@ class ModemWidget2 : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemWidget2(TQWidget *tqparent=0, const char *name=0); + ModemWidget2(TQWidget *parent=0, const char *name=0); bool save(); private slots: @@ -117,7 +117,7 @@ class GraphSetup : public TQWidget { Q_OBJECT TQ_OBJECT public: - GraphSetup(TQWidget *tqparent = 0, const char *name = 0); + GraphSetup(TQWidget *parent = 0, const char *name = 0); private slots: void enableToggled(bool); diff --git a/kppp/iplined.cpp b/kppp/iplined.cpp index 38603633..989c790c 100644 --- a/kppp/iplined.cpp +++ b/kppp/iplined.cpp @@ -26,8 +26,8 @@ #include "iplined.h" -IPLineEdit::IPLineEdit( TQWidget *tqparent, const char *name ) - : KRestrictedLine(tqparent, name, "0123456789.") +IPLineEdit::IPLineEdit( TQWidget *parent, const char *name ) + : KRestrictedLine(parent, name, "0123456789.") { setMaxLength(3 * 4 + 1 * 3); } diff --git a/kppp/iplined.h b/kppp/iplined.h index 3ba6202f..64a6dcbb 100644 --- a/kppp/iplined.h +++ b/kppp/iplined.h @@ -31,7 +31,7 @@ class IPLineEdit : public KRestrictedLine { public: - IPLineEdit( TQWidget *tqparent=0, const char *name=0 ); + IPLineEdit( TQWidget *parent=0, const char *name=0 ); ~IPLineEdit() {} virtual TQSize tqsizeHint() const; diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 4a335d45..8b73d393 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -74,8 +74,8 @@ extern KPPPWidget *p_kppp; -KPPPWidget::KPPPWidget( TQWidget *tqparent, const char *name ) - : DCOPObject( "KpppIface" ), TQWidget(tqparent, name) +KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) + : DCOPObject( "KpppIface" ), TQWidget(parent, name) , acct(0) , m_bCmdlAccount (false) , m_bCmdlModem (false) diff --git a/kppp/kpppwidget.h b/kppp/kpppwidget.h index 08c9e956..596464a3 100644 --- a/kppp/kpppwidget.h +++ b/kppp/kpppwidget.h @@ -64,7 +64,7 @@ class KPPPWidget : public TQWidget, virtual public KpppIface { TQ_OBJECT public: - KPPPWidget( TQWidget *tqparent=0, const char *name=0 ); + KPPPWidget( TQWidget *parent=0, const char *name=0 ); ~KPPPWidget(); void setPW_Edit(const TQString &); diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index 65232a93..4be1dea0 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -35,8 +35,8 @@ extern KPPPWidget *p_kppp; -LoginMultiLineEdit::LoginMultiLineEdit(TQWidget *tqparent, const char *name) - : TQMultiLineEdit(tqparent, name) +LoginMultiLineEdit::LoginMultiLineEdit(TQWidget *parent, const char *name) + : TQMultiLineEdit(parent, name) { } @@ -93,8 +93,8 @@ void LoginMultiLineEdit::readChar(unsigned char c) { } -LoginTerm::LoginTerm (TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, FALSE) +LoginTerm::LoginTerm (TQWidget *parent, const char *name) + : TQDialog(parent, name, FALSE) { setCaption(i18n("Login Terminal Window")); setMinimumSize(300, 200); diff --git a/kppp/loginterm.h b/kppp/loginterm.h index 0940381c..ca2142fb 100644 --- a/kppp/loginterm.h +++ b/kppp/loginterm.h @@ -13,7 +13,7 @@ class LoginMultiLineEdit : public TQMultiLineEdit { public: - LoginMultiLineEdit(TQWidget *tqparent, const char *name); + LoginMultiLineEdit(TQWidget *parent, const char *name); ~LoginMultiLineEdit(); void keyPressEvent(TQKeyEvent *k); @@ -30,7 +30,7 @@ class LoginTerm : public TQDialog { Q_OBJECT TQ_OBJECT public: - LoginTerm(TQWidget *tqparent, const char *name); + LoginTerm(TQWidget *parent, const char *name); bool pressedContinue(); diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index e741405d..b646acdc 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -47,8 +47,8 @@ ExportFormats [] = { /***** ExportWizard *****/ -ExportWizard::ExportWizard(TQWidget *tqparent, const TQString &_date) - : KWizard(tqparent, "", true) { +ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) + : KWizard(parent, "", true) { date = _date; filterID = 0; diff --git a/kppp/logview/export.h b/kppp/logview/export.h index d99748aa..fb1f0291 100644 --- a/kppp/logview/export.h +++ b/kppp/logview/export.h @@ -42,7 +42,7 @@ class ExportWizard : public KWizard { Q_OBJECT TQ_OBJECT public: - ExportWizard(TQWidget *tqparent, const TQString &_date); + ExportWizard(TQWidget *parent, const TQString &_date); Export *createExportFilter(); int filterID; diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 80adc7bf..831976cc 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -107,12 +107,12 @@ static void costsMonth(double costs, double &result) { class LogListItem : public TQListViewItem { public: LogListItem(LogInfo *l, - TQListView * tqparent, + TQListView * parent, TQString s1, TQString s2, TQString s3, TQString s4, TQString s5, TQString s6, TQString s7, TQString s8) - : TQListViewItem(tqparent, s1, s2, s3, s4, s5, s6, s7, s8), + : TQListViewItem(parent, s1, s2, s3, s4, s5, s6, s7, s8), li(l) { } @@ -167,8 +167,8 @@ TQString LogListItem::key(int c, bool ascending) const return k; } -MonthlyWidget::MonthlyWidget(TQWidget *tqparent) : - TQWidget(tqparent) +MonthlyWidget::MonthlyWidget(TQWidget *parent) : + TQWidget(parent) { tl = 0; diff --git a/kppp/logview/monthly.h b/kppp/logview/monthly.h index 516310a4..2889a5af 100644 --- a/kppp/logview/monthly.h +++ b/kppp/logview/monthly.h @@ -40,7 +40,7 @@ class MonthlyWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - MonthlyWidget(TQWidget *tqparent = 0); + MonthlyWidget(TQWidget *parent = 0); private slots: void prevMonth(); diff --git a/kppp/main.cpp b/kppp/main.cpp index 9890e9e1..b6bb6c57 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -135,7 +135,7 @@ extern "C" { int main( int argc, char **argv ) { // make sure that open/fopen and so on NEVER return 1 or 2 (stdout and stderr) - // Expl: if stdout/stderr were closed on program start (by tqparent), open() + // Expl: if stdout/stderr were closed on program start (by parent), open() // would return a FD of 1, 2 (or even 0 if stdin was closed too) if(fcntl(0, F_GETFL) == -1) (void)open("/dev/null", O_RDONLY); @@ -172,7 +172,7 @@ int main( int argc, char **argv ) { exit(1); } - // tqparent process + // parent process close(sockets[1]); // drop setuid status diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 2c917e3f..1ed655c7 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -47,8 +47,8 @@ extern PPPData gpppdata; -MiniTerm::MiniTerm(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, true) +MiniTerm::MiniTerm(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Kppp Mini-Terminal")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -225,8 +225,8 @@ void MiniTerm::help() { } -MyTerm::MyTerm(TQWidget *tqparent, const char* name) - : TQMultiLineEdit(tqparent, name) +MyTerm::MyTerm(TQWidget *parent, const char* name) + : TQMultiLineEdit(parent, name) { setFont(KGlobalSettings::fixedFont()); } diff --git a/kppp/miniterm.h b/kppp/miniterm.h index f1a6ab66..d329818d 100644 --- a/kppp/miniterm.h +++ b/kppp/miniterm.h @@ -47,7 +47,7 @@ class MyTerm : public TQMultiLineEdit { Q_OBJECT TQ_OBJECT public: - MyTerm(TQWidget *tqparent=0, const char *name=0); + MyTerm(TQWidget *parent=0, const char *name=0); void keyPressEvent (TQKeyEvent*); void insertChar(unsigned char c); @@ -64,7 +64,7 @@ class MiniTerm : public TQDialog { TQ_OBJECT public: - MiniTerm(TQWidget *tqparent=0, const char *name=0); + MiniTerm(TQWidget *parent=0, const char *name=0); ~MiniTerm(); void closeEvent( TQCloseEvent *e ); diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 77c76134..dae8bd0f 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -45,8 +45,8 @@ // a little trick to make the label look like a disabled lineedit #define FORMATSLIDERLABEL(l) l->setFixedWidth(l->tqsizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).tqsizeHint().height()); l->tqsetAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2); -ModemCommands::ModemCommands(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n("Edit Modem Commands"), Ok|Cancel) +ModemCommands::ModemCommands(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel) { KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); TQWidget *dummyWidget = new TQWidget(this); diff --git a/kppp/modemcmds.h b/kppp/modemcmds.h index 2a7486f9..f028167a 100644 --- a/kppp/modemcmds.h +++ b/kppp/modemcmds.h @@ -50,7 +50,7 @@ Q_OBJECT public: - ModemCommands(TQWidget *tqparent=0, const char *name=0); + ModemCommands(TQWidget *parent=0, const char *name=0); ~ModemCommands() {} private slots: diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 4da23213..35eff389 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -42,7 +42,7 @@ #include <kconfig.h> #include <kstdguiitem.h> -ModemSelector::ModemSelector(TQWidget *tqparent) : TQDialog(tqparent, 0, true) { +ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { // set up widgets and such setCaption(i18n("Select Modem Type")); TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); @@ -173,7 +173,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { map = modemDB->entryMap(key); it = map.begin(); - // remove tqparent attribute + // remove parent attribute dict.setAutoDelete(true); dict.remove("Parent"); @@ -190,7 +190,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { dict.replace("Name", new TQString(key)); } - // check tqparent attribute + // check parent attribute if(dict["Parent"] != 0) loadModem(*dict["Parent"], dict); else diff --git a/kppp/modemdb.h b/kppp/modemdb.h index f0c6c406..f8bd84e3 100644 --- a/kppp/modemdb.h +++ b/kppp/modemdb.h @@ -69,7 +69,7 @@ class ModemSelector : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemSelector(TQWidget *tqparent = 0); + ModemSelector(TQWidget *parent = 0); ~ModemSelector(); private slots: diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 737d468a..8c9f00cd 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -35,8 +35,8 @@ #include "modem.h" #include <klocale.h> -ModemTransfer::ModemTransfer(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) + : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) { setCaption(i18n("ATI Query")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -240,8 +240,8 @@ void ModemTransfer::closeEvent( TQCloseEvent *e ) { } -ModemInfo::ModemInfo(TQWidget *tqparent, const char* name) - : TQDialog(tqparent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) +ModemInfo::ModemInfo(TQWidget *parent, const char* name) + : TQDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) { TQString label_text; diff --git a/kppp/modeminfo.h b/kppp/modeminfo.h index aeeb86e0..6bf3956e 100644 --- a/kppp/modeminfo.h +++ b/kppp/modeminfo.h @@ -43,7 +43,7 @@ class ModemTransfer : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemTransfer(TQWidget *tqparent=0, const char *name=0); + ModemTransfer(TQWidget *parent=0, const char *name=0); public slots: void init(); @@ -77,7 +77,7 @@ class ModemInfo : public TQDialog { Q_OBJECT TQ_OBJECT public: - ModemInfo(TQWidget *tqparent=0, const char *name=0); + ModemInfo(TQWidget *parent=0, const char *name=0); public: void setAtiString(int num, TQString s); diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 84b0979e..9cbe6d9a 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -50,17 +50,17 @@ void parseargs(char* buf, char** args); -ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { int min = 0; - TQVBoxLayout *l1 = new TQVBoxLayout(tqparent, 10, 10); + TQVBoxLayout *l1 = new TQVBoxLayout(parent, 10, 10); // add a hbox TQHBoxLayout *l11 = new TQHBoxLayout; l1->addLayout(l11); - modemlist_l = new TQListBox(tqparent); + modemlist_l = new TQListBox(parent); modemlist_l->setMinimumSize(160, 128); connect(modemlist_l, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotListBoxSelect(int))); @@ -70,7 +70,7 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); - edit_b = new TQPushButton(i18n("&Edit..."), tqparent); + edit_b = new TQPushButton(i18n("&Edit..."), parent); connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); @@ -80,13 +80,13 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) l111->addWidget(edit_b); - new_b = new TQPushButton(i18n("&New..."), tqparent); + new_b = new TQPushButton(i18n("&New..."), parent); connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newmodem())); l111->addWidget(new_b); TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n" "to the Internet")); - copy_b = new TQPushButton(i18n("Co&py"), tqparent); + copy_b = new TQPushButton(i18n("Co&py"), parent); connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copymodem())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, @@ -95,7 +95,7 @@ ModemsWidget::ModemsWidget( TQWidget *tqparent, const char *name ) "to a new account that you can modify to fit your\n" "needs")); - delete_b = new TQPushButton(i18n("De&lete"), tqparent); + delete_b = new TQPushButton(i18n("De&lete"), parent); connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deletemodem())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, diff --git a/kppp/modems.h b/kppp/modems.h index 069139af..0e3fa775 100644 --- a/kppp/modems.h +++ b/kppp/modems.h @@ -47,7 +47,7 @@ class ModemsWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - ModemsWidget( TQWidget *tqparent=0, const char *name=0 ); + ModemsWidget( TQWidget *parent=0, const char *name=0 ); ~ModemsWidget() {} private slots: diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp index 66ed8649..49676ddd 100644 --- a/kppp/newwidget.cpp +++ b/kppp/newwidget.cpp @@ -6,8 +6,8 @@ #include "newwidget.h" -TQLineEdit *newLineEdit(int visiblewidth, TQWidget *tqparent) { - TQLineEdit *l = new TQLineEdit(tqparent); +TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent) { + TQLineEdit *l = new TQLineEdit(parent); if(visiblewidth == 0) l->setMinimumWidth(l->tqsizeHint().width()); else diff --git a/kppp/newwidget.h b/kppp/newwidget.h index 49d79e69..07129c74 100644 --- a/kppp/newwidget.h +++ b/kppp/newwidget.h @@ -14,6 +14,6 @@ #define L_FIXEDH 2 #define L_FIXED (L_FIXEDW | L_FIXEDH) -TQLineEdit *newLineEdit(int visiblewidth, TQWidget *tqparent); +TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent); #endif diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 7f61f775..88d27c87 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -30,7 +30,7 @@ * the setuid root part of kppp. So please be careful ! * o restrain from using X, TQt or KDE library calls * o check for possible buffer overflows - * o handle requests from the tqparent process with care. They might be forged. + * o handle requests from the parent process with care. They might be forged. * o be paranoid and think twice about everything you change. */ @@ -519,7 +519,7 @@ bool Opener::execpppd(const char *arguments) { switch(pppdPid = fork()) { case -1: - fprintf(stderr,"In tqparent: fork() failed\n"); + fprintf(stderr,"In parent: fork() failed\n"); return false; break; @@ -561,7 +561,7 @@ bool Opener::execpppd(const char *arguments) { break; default: - Debug2("In tqparent: pppd pid %d\n",pppdPid); + Debug2("In parent: pppd pid %d\n",pppdPid); close(ttyfd); ttyfd = -1; return true; diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index b057e9b5..3b4abc3a 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -40,8 +40,8 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -PPPdArguments::PPPdArguments(TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name, TRUE) +PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) + : TQDialog(parent, name, TRUE) { setCaption(i18n("Customize pppd Arguments")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); diff --git a/kppp/pppdargs.h b/kppp/pppdargs.h index 300e3f99..6c0e1fee 100644 --- a/kppp/pppdargs.h +++ b/kppp/pppdargs.h @@ -41,7 +41,7 @@ class PPPdArguments : public TQDialog { Q_OBJECT TQ_OBJECT public: - PPPdArguments(TQWidget *tqparent=0, const char *name=0); + PPPdArguments(TQWidget *parent=0, const char *name=0); ~PPPdArguments() {} private slots: diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index 62dfeaa9..ceb8298b 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -1199,12 +1199,12 @@ void PPPData::setIpaddr(const TQString &n) { } -const TQString PPPData::subnettqmask() { +const TQString PPPData::subnetmask() { return readConfig(caccountgroup, SUBNETMASK_KEY); } -void PPPData::setSubnettqmask(const TQString &n) { +void PPPData::setSubnetmask(const TQString &n) { writeConfig(caccountgroup, SUBNETMASK_KEY, n); } diff --git a/kppp/pppdata.h b/kppp/pppdata.h index 8956f6c8..904ef581 100644 --- a/kppp/pppdata.h +++ b/kppp/pppdata.h @@ -413,8 +413,8 @@ public: const TQString ipaddr(); void setIpaddr(const TQString &); - const TQString subnettqmask(); - void setSubnettqmask(const TQString &); + const TQString subnetmask(); + void setSubnetmask(const TQString &); bool AcctEnabled(); void setAcctEnabled(bool set); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 15582324..39c1490d 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -44,9 +44,9 @@ extern PPPData gpppdata; -PPPStatsDlg::PPPStatsDlg(TQWidget *tqparent, const char *name, TQWidget *, +PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, PPPStats *st) - : TQWidget(tqparent, name, 0), + : TQWidget(parent, name, 0), stats(st) { int i; diff --git a/kppp/pppstatdlg.h b/kppp/pppstatdlg.h index cfb3a464..95218d26 100644 --- a/kppp/pppstatdlg.h +++ b/kppp/pppstatdlg.h @@ -49,7 +49,7 @@ class PPPStatsDlg : public TQWidget { public: - PPPStatsDlg(TQWidget *tqparent, const char *name,TQWidget *main, + PPPStatsDlg(TQWidget *parent, const char *name,TQWidget *main, PPPStats *st); ~PPPStatsDlg(); diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index f27c5528..97d13612 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -48,8 +48,8 @@ TQWizard* ProviderDB::wiz = 0L; -ProviderDB::ProviderDB(TQWidget *tqparent) : - KWizard(tqparent, "", true), +ProviderDB::ProviderDB(TQWidget *parent) : + KWizard(parent, "", true), cfg(0) { setCaption(i18n("Create New Account")); @@ -164,7 +164,7 @@ void ProviderDB::accept() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Intro::PDB_Intro(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Intro::PDB_Intro(TQWidget *parent) : TQWidget(parent) { TQLabel *l = new TQLabel(i18n("You will be asked a few questions on information\n" "which is needed to establish an Internet connection\n" "with your Internet Service Provider (ISP).\n\n" @@ -182,7 +182,7 @@ PDB_Intro::PDB_Intro(TQWidget *tqparent) : TQWidget(tqparent) { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Country::PDB_Country(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { TQLabel *l = new TQLabel(i18n("Select the location where you plan to use this\n" "account from the list below. If your country or\n" "location is not listed, you have to create the\n" @@ -251,7 +251,7 @@ PDB_Country::~PDB_Country() } void PDB_Country::selectionChanged(int idx) { - // TQWizard *wizard = (TQWizard *)tqparent(); Why doesn't this work ? + // TQWizard *wizard = (TQWizard *)parent(); Why doesn't this work ? ProviderDB::wiz->setNextEnabled(this, (idx != -1)); } @@ -259,7 +259,7 @@ void PDB_Country::selectionChanged(int idx) { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Provider::PDB_Provider(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Provider::PDB_Provider(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("Select your Internet Service Provider (ISP) from\n" "the list below. If the ISP is not in this list,\n" @@ -334,7 +334,7 @@ TQString PDB_Provider::getDir() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_UserInfo::PDB_UserInfo(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_UserInfo::PDB_UserInfo(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("To log on to your ISP, kppp needs the username\n" "and the password you got from your ISP. Type\n" @@ -388,7 +388,7 @@ void PDB_UserInfo::activate() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_DialPrefix::PDB_DialPrefix(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_DialPrefix::PDB_DialPrefix(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("If you need a special dial prefix (e.g. if you\n" "are using a telephone switch) you can specify\n" @@ -424,7 +424,7 @@ void PDB_DialPrefix::activate() { ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// -PDB_Finished::PDB_Finished(TQWidget *tqparent) : TQWidget(tqparent) { +PDB_Finished::PDB_Finished(TQWidget *parent) : TQWidget(parent) { TQVBoxLayout *tl = new TQVBoxLayout(this, 10, 10); TQLabel *l = new TQLabel(i18n("Finished!\n\n" "A new account has been created. Click \"Finish\" to\n" diff --git a/kppp/providerdb.h b/kppp/providerdb.h index 0705cac3..296780d1 100644 --- a/kppp/providerdb.h +++ b/kppp/providerdb.h @@ -46,7 +46,7 @@ class PDB_Intro : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Intro(TQWidget *tqparent); + PDB_Intro(TQWidget *parent); }; @@ -54,7 +54,7 @@ class PDB_Country : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Country(TQWidget *tqparent); + PDB_Country(TQWidget *parent); ~PDB_Country(); TQListBox *lb; TQStringList *list; @@ -68,7 +68,7 @@ class PDB_Provider : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Provider(TQWidget *tqparent); + PDB_Provider(TQWidget *parent); void setDir(const TQString &d); TQString getDir(); @@ -87,7 +87,7 @@ class PDB_UserInfo : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_UserInfo(TQWidget *tqparent); + PDB_UserInfo(TQWidget *parent); TQString username(); TQString password(); void activate(); @@ -105,7 +105,7 @@ class PDB_DialPrefix : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_DialPrefix(TQWidget *tqparent); + PDB_DialPrefix(TQWidget *parent); TQString prefix(); void activate(); @@ -118,7 +118,7 @@ class PDB_Finished : public TQWidget { Q_OBJECT TQ_OBJECT public: - PDB_Finished(TQWidget *tqparent); + PDB_Finished(TQWidget *parent); }; @@ -126,7 +126,7 @@ class ProviderDB : public KWizard { Q_OBJECT TQ_OBJECT public: - ProviderDB(TQWidget *tqparent); + ProviderDB(TQWidget *parent); ~ProviderDB(); static TQWizard *wiz; diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index e6cbea58..c3025762 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -30,10 +30,10 @@ #include <kglobalsettings.h> #include "pwentry.h" -PWEntry::PWEntry( TQWidget *tqparent, const char *name ) +PWEntry::PWEntry( TQWidget *parent, const char *name ) : TQWidget(NULL, name) { - if(tqparent){ + if(parent){ TQPoint point = mapToGlobal (TQPoint (0,0)); TQRect pos = tqgeometry(); @@ -43,7 +43,7 @@ PWEntry::PWEntry( TQWidget *tqparent, const char *name ) 300, 90); } else { - TQRect desk = KGlobalSettings::desktopGeometry(tqparent); + TQRect desk = KGlobalSettings::desktopGeometry(parent); setGeometry( desk.center().x() - 150, desk.center().y() - 50, 300, 90 ); } diff --git a/kppp/pwentry.h b/kppp/pwentry.h index 258c079e..aa7779cd 100644 --- a/kppp/pwentry.h +++ b/kppp/pwentry.h @@ -39,7 +39,7 @@ class PWEntry : public TQWidget { public: - PWEntry( TQWidget *tqparent=0, const char *name=0 ); + PWEntry( TQWidget *parent=0, const char *name=0 ); bool Consumed(); void setConsumed(); TQString text(); diff --git a/kppp/scriptedit.cpp b/kppp/scriptedit.cpp index afc3818d..afa88821 100644 --- a/kppp/scriptedit.cpp +++ b/kppp/scriptedit.cpp @@ -30,8 +30,8 @@ #include <tqcombobox.h> #include <tqlineedit.h> -ScriptEdit::ScriptEdit( TQWidget *tqparent, const char *name ) - : TQWidget(tqparent, name) +ScriptEdit::ScriptEdit( TQWidget *parent, const char *name ) + : TQWidget(parent, name) { TQHBoxLayout *tl = new TQHBoxLayout(this, 0, 10); diff --git a/kppp/scriptedit.h b/kppp/scriptedit.h index f94e717e..81cefd5b 100644 --- a/kppp/scriptedit.h +++ b/kppp/scriptedit.h @@ -37,7 +37,7 @@ class ScriptEdit : public TQWidget { Q_OBJECT TQ_OBJECT public: - ScriptEdit( TQWidget *tqparent=0, const char *name=0 ); + ScriptEdit( TQWidget *parent=0, const char *name=0 ); ~ScriptEdit() {} TQString text()const; diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index 7f394e40..fdbae624 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -46,8 +46,8 @@ const int XKeyRelease = KeyRelease; #endif -KeyCaptureDialog::KeyCaptureDialog(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n( "Enter Key Combination" ), +KeyCaptureDialog::KeyCaptureDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n( "Enter Key Combination" ), Cancel, Cancel, true), m_grabbed(false) { TQFrame *main = makeMainWidget(); TQVBoxLayout *tqlayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() ); diff --git a/krdc/keycapturedialog.h b/krdc/keycapturedialog.h index 5ee4c8d0..ee7a0153 100644 --- a/krdc/keycapturedialog.h +++ b/krdc/keycapturedialog.h @@ -33,7 +33,7 @@ class KeyCaptureDialog : public KDialogBase { bool m_grabbed; public: - KeyCaptureDialog(TQWidget * tqparent= 0, const char *name = 0); + KeyCaptureDialog(TQWidget * parent= 0, const char *name = 0); ~KeyCaptureDialog(); public slots: diff --git a/krdc/kfullscreenpanel.cpp b/krdc/kfullscreenpanel.cpp index a43cc96d..81cd49e7 100644 --- a/krdc/kfullscreenpanel.cpp +++ b/krdc/kfullscreenpanel.cpp @@ -54,10 +54,10 @@ void Counter::timeout() { } -KFullscreenPanel::KFullscreenPanel(TQWidget* tqparent, +KFullscreenPanel::KFullscreenPanel(TQWidget* parent, const char *name, const TQSize &resolution) : - TQWidget(tqparent, name), + TQWidget(parent, name), m_child(0), m_layout(0), m_fsResolution(resolution), diff --git a/krdc/kfullscreenpanel.h b/krdc/kfullscreenpanel.h index 4d714959..d6e28927 100644 --- a/krdc/kfullscreenpanel.h +++ b/krdc/kfullscreenpanel.h @@ -57,7 +57,7 @@ private: void doLayout(); public: - KFullscreenPanel(TQWidget* tqparent, const char *name, + KFullscreenPanel(TQWidget* parent, const char *name, const TQSize &resolution); ~KFullscreenPanel(); diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index e6384ccd..e77079db 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -385,8 +385,8 @@ TQSize KRDC::tqsizeHint() return m_view->framebufferSize(); } -TQPopupMenu *KRDC::createPopupMenu(TQWidget *tqparent) const { - KPopupMenu *pu = new KPopupMenu(tqparent); +TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const { + KPopupMenu *pu = new KPopupMenu(parent); pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID); pu->setCheckable(true); pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly()); diff --git a/krdc/krdc.h b/krdc/krdc.h index 1cd5b739..d78dc959 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -121,7 +121,7 @@ private: static const int TOOLBAR_SPEED_DOWN; static const int TOOLBAR_SPEED_UP; void fsToolbarScheduleHidden(); - TQPopupMenu *createPopupMenu(TQWidget *tqparent) const; + TQPopupMenu *createPopupMenu(TQWidget *parent) const; protected: virtual void mouseMoveEvent(TQMouseEvent *e); diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp index cd887299..a3dbce40 100644 --- a/krdc/kremoteview.cpp +++ b/krdc/kremoteview.cpp @@ -17,10 +17,10 @@ #include "kremoteview.h" -KRemoteView::KRemoteView(TQWidget *tqparent, +KRemoteView::KRemoteView(TQWidget *parent, const char *name, WFlags f) : - TQWidget(tqparent, name, f), + TQWidget(parent, name, f), m_status(REMOTE_VIEW_DISCONNECTED) { } diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h index 6aa68151..0b0ae11c 100644 --- a/krdc/kremoteview.h +++ b/krdc/kremoteview.h @@ -66,7 +66,7 @@ class KRemoteView : public TQWidget Q_OBJECT TQ_OBJECT public: - KRemoteView(TQWidget *tqparent = 0, + KRemoteView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); @@ -266,7 +266,7 @@ signals: * Emitted when the mouse on the remote side has been moved. * @param x the new x coordinate * @param y the new y coordinate - * @param buttonMask the tqmask of mouse buttons (bit 0 for first mouse + * @param buttonMask the mask of mouse buttons (bit 0 for first mouse * button, 1 for second button etc)a */ void mouseStateChanged(int x, int y, int buttonMask); diff --git a/krdc/kservicelocator.cpp b/krdc/kservicelocator.cpp index a14a4dc7..b7f58816 100644 --- a/krdc/kservicelocator.cpp +++ b/krdc/kservicelocator.cpp @@ -297,19 +297,19 @@ class AsyncThread : public TQThread { protected: SLPHandle m_handle; KServiceLocatorPrivate *m_parent; - AsyncThread(SLPHandle handle, KServiceLocatorPrivate *tqparent) : + AsyncThread(SLPHandle handle, KServiceLocatorPrivate *parent) : m_handle(handle), - m_parent(tqparent) { + m_parent(parent) { } }; class FindSrvTypesThread : public AsyncThread { TQString m_namingAuthority, m_scopeList; public: FindSrvTypesThread(SLPHandle handle, - KServiceLocatorPrivate *tqparent, + KServiceLocatorPrivate *parent, const char *namingAuthority, const char *scopeList) : - AsyncThread(handle, tqparent), + AsyncThread(handle, parent), m_namingAuthority(namingAuthority), m_scopeList(scopeList){ } @@ -330,11 +330,11 @@ class FindSrvsThread : public AsyncThread { TQString m_srvUrl, m_scopeList, m_filter; public: FindSrvsThread(SLPHandle handle, - KServiceLocatorPrivate *tqparent, + KServiceLocatorPrivate *parent, const char *srvUrl, const char *scopeList, const char *filter) : - AsyncThread(handle, tqparent), + AsyncThread(handle, parent), m_srvUrl(srvUrl), m_scopeList(scopeList), m_filter(filter) { @@ -358,11 +358,11 @@ class FindAttrsThread : public AsyncThread { TQString m_srvUrl, m_scopeList, m_attrIds; public: FindAttrsThread(SLPHandle handle, - KServiceLocatorPrivate *tqparent, + KServiceLocatorPrivate *parent, const char *srvUrl, const char *scopeList, const char *attrIds) : - AsyncThread(handle, tqparent), + AsyncThread(handle, parent), m_srvUrl(srvUrl), m_scopeList(scopeList), m_attrIds(attrIds) { @@ -384,8 +384,8 @@ public: class FindScopesThread : public AsyncThread { public: FindScopesThread(SLPHandle handle, - KServiceLocatorPrivate *tqparent) : - AsyncThread(handle, tqparent){ + KServiceLocatorPrivate *parent) : + AsyncThread(handle, parent){ } virtual void run() { SLPError e; diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp index 2e052200..c6d559a5 100644 --- a/krdc/maindialog.cpp +++ b/krdc/maindialog.cpp @@ -25,8 +25,8 @@ #include <kguiitem.h> #include <klocale.h> -MainDialog::MainDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n( "Remote Desktop Connection" ), +MainDialog::MainDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "Remote Desktop Connection" ), Ok|Close|Help|User1, Ok, true, KGuiItem( i18n( "&Preferences" ), "configure" ) ) { diff --git a/krdc/maindialog.h b/krdc/maindialog.h index 240dc8b2..03900ed9 100644 --- a/krdc/maindialog.h +++ b/krdc/maindialog.h @@ -29,7 +29,7 @@ class MainDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - MainDialog( TQWidget *tqparent, const char *name=0 ); + MainDialog( TQWidget *parent, const char *name=0 ); ~MainDialog() {} void setRemoteHost( const TQString & ); diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index a76e31d1..eed72b99 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -77,8 +77,8 @@ class UrlListViewItem : public KListViewItem TQString m_serviceid; }; -MainDialogWidget::MainDialogWidget( TQWidget *tqparent, const char *name ) - : MainDialogBase( tqparent, name ), +MainDialogWidget::MainDialogWidget( TQWidget *parent, const char *name ) + : MainDialogBase( parent, name ), m_scanning( false ) { HostPreferences *hp = HostPreferences::instance(); diff --git a/krdc/maindialogwidget.h b/krdc/maindialogwidget.h index 254cb755..5241bee6 100644 --- a/krdc/maindialogwidget.h +++ b/krdc/maindialogwidget.h @@ -33,7 +33,7 @@ class MainDialogWidget : public MainDialogBase TQ_OBJECT public: - MainDialogWidget( TQWidget *tqparent, const char *name ); + MainDialogWidget( TQWidget *parent, const char *name ); ~MainDialogWidget(); void setRemoteHost( const TQString & ); diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index 3129abf6..ab302434 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -32,9 +32,9 @@ #include <klistview.h> #include <klocale.h> -PreferencesDialog::PreferencesDialog( TQWidget *tqparent, const char *name ) +PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name ) : KDialogBase( Tabbed, i18n( "Preferences" ), Ok|Cancel, Ok, - tqparent, name, true ) + parent, name, true ) { TQVBox *page; TQWidget *spacer; diff --git a/krdc/preferencesdialog.h b/krdc/preferencesdialog.h index fa927a39..947d38c0 100644 --- a/krdc/preferencesdialog.h +++ b/krdc/preferencesdialog.h @@ -36,7 +36,7 @@ class PreferencesDialog : public KDialogBase TQ_OBJECT public: - PreferencesDialog( TQWidget *tqparent, const char *name=0 ); + PreferencesDialog( TQWidget *parent, const char *name=0 ); ~PreferencesDialog() {}; protected slots: diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 4462cca3..4e5bc632 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -45,8 +45,8 @@ extern KWallet::Wallet *wallet; static KRdpView *krdpview; -RdpContainer::RdpContainer(TQWidget *tqparent, const char *name, WFlags f) : - QXEmbed(tqparent, name, f), +RdpContainer::RdpContainer(TQWidget *parent, const char *name, WFlags f) : + QXEmbed(parent, name, f), m_viewOnly(false) { } @@ -82,12 +82,12 @@ bool RdpContainer::x11Event(XEvent *e) // constructor -KRdpView::KRdpView(TQWidget *tqparent, const char *name, +KRdpView::KRdpView(TQWidget *parent, const char *name, const TQString &host, int port, const TQString &user, const TQString &password, int flags, const TQString &domain, const TQString &shell, const TQString &directory) : - KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents), + KRemoteView(parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents), m_name(name), m_host(host), m_port(port), diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h index c0df50e7..c34d3c27 100644 --- a/krdc/rdp/krdpview.h +++ b/krdc/rdp/krdpview.h @@ -39,7 +39,7 @@ class RdpContainer : public QXEmbed friend class KRdpView; public: - RdpContainer(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + RdpContainer(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); ~RdpContainer(); signals: @@ -60,7 +60,7 @@ class KRdpView : public KRemoteView public: // constructor and destructor - KRdpView(TQWidget *tqparent = 0, const char *name = 0, + KRdpView(TQWidget *parent = 0, const char *name = 0, const TQString &host = TQString(), int port = TCP_PORT_RDP, const TQString &user = TQString(), const TQString &password = TQString(), int flags = RDP_LOGON_NORMAL, const TQString &domain = TQString(), diff --git a/krdc/rdp/rdesktop.patch b/krdc/rdp/rdesktop.patch index 954d5fc2..a027799c 100644 --- a/krdc/rdp/rdesktop.patch +++ b/krdc/rdp/rdesktop.patch @@ -71,6 +71,6 @@ + XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0); + } + - input_tqmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | VisibilityChangeMask | FocusChangeMask; diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c index 2975e731..003a7160 100644 --- a/krdc/vnc/desktop.c +++ b/krdc/vnc/desktop.c @@ -1380,10 +1380,10 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale, UintXX *dst_row; \ UintXX c1, c2, c3, c4;\ Uint32 R, G, B, A=0; \ - UintXX Rtqmask = image->red_mask;\ - UintXX Gtqmask = image->green_mask;\ - UintXX Btqmask = image->blue_mask;\ - UintXX Atqmask = 0;\ + UintXX Rmask = image->red_mask;\ + UintXX Gmask = image->green_mask;\ + UintXX Bmask = image->blue_mask;\ + UintXX Amask = 0;\ Uint32 wx, wy;\ Uint32 p1, p2, p3, p4;\ \ @@ -1449,11 +1449,11 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale, c4 = *(src_row + (ry+1)*src_pitch + rx+1);\ \ /* Calculate the average */\ - R = ((p1*(c1 & Rtqmask) + p2*(c2 & Rtqmask) + p3*(c3 & Rtqmask) + p4*(c4 & Rtqmask))>>7) & Rtqmask;\ - G = ((p1*(c1 & Gtqmask) + p2*(c2 & Gtqmask) + p3*(c3 & Gtqmask) + p4*(c4 & Gtqmask))>>7) & Gtqmask;\ - B = ((p1*(c1 & Btqmask) + p2*(c2 & Btqmask) + p3*(c3 & Btqmask) + p4*(c4 & Btqmask))>>7) & Btqmask;\ - if(Atqmask)\ - A = ((p1*(c1 & Atqmask) + p2*(c2 & Atqmask) + p3*(c3 & Atqmask) + p4*(c4 & Atqmask))>>7) & Atqmask;\ + R = ((p1*(c1 & Rmask) + p2*(c2 & Rmask) + p3*(c3 & Rmask) + p4*(c4 & Rmask))>>7) & Rmask;\ + G = ((p1*(c1 & Gmask) + p2*(c2 & Gmask) + p3*(c3 & Gmask) + p4*(c4 & Gmask))>>7) & Gmask;\ + B = ((p1*(c1 & Bmask) + p2*(c2 & Bmask) + p3*(c3 & Bmask) + p4*(c4 & Bmask))>>7) & Bmask;\ + if(Amask)\ + A = ((p1*(c1 & Amask) + p2*(c2 & Amask) + p3*(c3 & Amask) + p4*(c4 & Amask))>>7) & Amask;\ \ *(dst_row + x) = R | G | B | A;\ } \ diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 59ac4c9f..02cd3a78 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -64,7 +64,7 @@ static TQWaitCondition passwordWaiter; const unsigned int MAX_SELECTION_LENGTH = 4096; -KVncView::KVncView(TQWidget *tqparent, +KVncView::KVncView(TQWidget *parent, const char *name, const TQString &_host, int _port, @@ -72,7 +72,7 @@ KVncView::KVncView(TQWidget *tqparent, Quality quality, DotCursorState dotCursorState, const TQString &encodings) : - KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents), + KRemoteView(parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents), m_cthread(this, m_wthread, m_quitFlag), m_wthread(this, m_quitFlag), m_quitFlag(false), @@ -100,7 +100,7 @@ KVncView::KVncView(TQWidget *tqparent, TQBitmap cursorBitmap(dirs->findResource("appdata", "pics/pointcursor.png")); TQBitmap cursorMask(dirs->findResource("appdata", - "pics/pointcursortqmask.png")); + "pics/pointcursormask.png")); m_cursor = TQCursor(cursorBitmap, cursorMask); if ((quality != TQUALITY_UNKNOWN) || diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index 3cd72a5c..7fdf402c 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -77,7 +77,7 @@ protected: bool x11Event(XEvent*); public: - KVncView(TQWidget* tqparent=0, const char *name=0, + KVncView(TQWidget* parent=0, const char *name=0, const TQString &host = TQString(""), int port = 5900, const TQString &password = TQString(), Quality quality = TQUALITY_UNKNOWN, diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c index 371912a4..13676bb6 100644 --- a/krdc/vnc/rfbproto.c +++ b/krdc/vnc/rfbproto.c @@ -558,7 +558,7 @@ HandleSoftCursorSetImage(rfbSoftCursorSetImage *msg, rfbRectangle *rect) /* framebuffer must be locked when calling this!!! */ static Bool -PointerMove(unsigned int x, unsigned int y, unsigned int tqmask, +PointerMove(unsigned int x, unsigned int y, unsigned int mask, int ox, int oy, int ow, int oh) { int nx, ny, nw, nh; @@ -585,7 +585,7 @@ PointerMove(unsigned int x, unsigned int y, unsigned int tqmask, SyncScreenRegion(nx, ny, nw, nh); } - postMouseEvent(cursorX, cursorY, tqmask); + postMouseEvent(cursorX, cursorY, mask); return True; } @@ -759,7 +759,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3 if (width * height == 0) return True; - /* Allocate memory for pixel data and temporary tqmask data. */ + /* Allocate memory for pixel data and temporary mask data. */ rcSource = malloc(width * height * bytesPerPixel); if (rcSource == NULL) @@ -830,7 +830,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3 } } - /* Read tqmask data. */ + /* Read mask data. */ if (!ReadFromRFBServer((char*)rcMask, bytesMaskData)) { free(rcSource); diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h index 9622eb2e..1b5fd839 100644 --- a/krdc/vnc/rfbproto.h +++ b/krdc/vnc/rfbproto.h @@ -436,11 +436,11 @@ typedef struct { * the last tile in each row will be correspondingly smaller. Similarly if the * height is not an exact multiple of 16 then the height of each tile in the * final row will also be smaller. Each tile begins with a "subencoding" type - * byte, which is a tqmask made up of a number of bits. If the Raw bit is set + * byte, which is a mask made up of a number of bits. If the Raw bit is set * then the other bits are irrelevant; w*h pixel values follow (where w and h * are the width and height of the tile). Otherwise the tile is encoded in a * similar way to RRE, except that the position and size of each subrectangle - * can be specified in just two bytes. The other bits in the tqmask are as + * can be specified in just two bytes. The other bits in the mask are as * follows: * * BackgroundSpecified - if set, a pixel value follows which specifies @@ -706,10 +706,10 @@ typedef struct { CARD16 imageLength; /* * Followed by an image of the cursor in the client's image format - * with the following RLE tqmask compression. It begins with CARD8 that - * specifies the number of tqmask'ed pixels that will be NOT transmitted. - * Then follows a CARD8 that specified by the number of untqmask'd pixels - * that will be transmitted next. Then a CARD8 with the number of tqmask'd + * with the following RLE mask compression. It begins with CARD8 that + * specifies the number of mask'ed pixels that will be NOT transmitted. + * Then follows a CARD8 that specified by the number of unmask'd pixels + * that will be transmitted next. Then a CARD8 with the number of mask'd * pixels and so on. */ } rfbSoftCursorSetImage; diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc index f881f28d..d767b5a2 100644 --- a/krfb/krfb/connectiondialog.cc +++ b/krfb/krfb/connectiondialog.cc @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <klocale.h> -ConnectionDialog::ConnectionDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n( "New Connection" ), +ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "New Connection" ), Ok|Cancel, Cancel, true ) { m_connectWidget = new ConnectionWidget( this, "ConnectWidget" ); diff --git a/krfb/krfb/connectiondialog.h b/krfb/krfb/connectiondialog.h index 967587a5..5f20e33a 100644 --- a/krfb/krfb/connectiondialog.h +++ b/krfb/krfb/connectiondialog.h @@ -30,7 +30,7 @@ class ConnectionDialog : public KDialogBase TQ_OBJECT public: - ConnectionDialog( TQWidget *tqparent, const char *name ); + ConnectionDialog( TQWidget *parent, const char *name ); ~ConnectionDialog() {}; void setRemoteHost( const TQString &host ); diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc index 046a7a92..73d55b75 100644 --- a/krfb/krfb/invitedialog.cc +++ b/krfb/krfb/invitedialog.cc @@ -27,8 +27,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> -InviteDialog::InviteDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n( "Invitation" ), +InviteDialog::InviteDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "Invitation" ), User1|Close|Help, NoDefault, true ) { m_inviteWidget = new InviteWidget( this, "InviteWidget" ); diff --git a/krfb/krfb/invitedialog.h b/krfb/krfb/invitedialog.h index 6ce32097..9715f3e3 100644 --- a/krfb/krfb/invitedialog.h +++ b/krfb/krfb/invitedialog.h @@ -30,7 +30,7 @@ class InviteDialog : public KDialogBase TQ_OBJECT public: - InviteDialog( TQWidget *tqparent, const char *name ); + InviteDialog( TQWidget *parent, const char *name ); ~InviteDialog() {} void enableInviteButton( bool enable ); diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc index 1f61e392..245e0069 100644 --- a/krfb/krfb/personalinvitedialog.cc +++ b/krfb/krfb/personalinvitedialog.cc @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <klocale.h> -PersonalInviteDialog::PersonalInviteDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n( "Personal Invitation" ), +PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "Personal Invitation" ), Close, Close, true ) { m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" ); diff --git a/krfb/krfb/personalinvitedialog.h b/krfb/krfb/personalinvitedialog.h index 89be019c..6f28a33d 100644 --- a/krfb/krfb/personalinvitedialog.h +++ b/krfb/krfb/personalinvitedialog.h @@ -29,7 +29,7 @@ class PersonalInviteWidget; class PersonalInviteDialog : public KDialogBase { public: - PersonalInviteDialog( TQWidget *tqparent, const char *name ); + PersonalInviteDialog( TQWidget *parent, const char *name ); virtual ~PersonalInviteDialog() {} void setHost( const TQString &host, uint port ); diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 82ad4ad9..93dc5539 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -88,7 +88,7 @@ static const char* cur= " xxx " " "; -static const char* tqmask= +static const char* mask= "xx " "xxx " "xxxx " @@ -279,7 +279,7 @@ Display *PointerEvent::dpy; int PointerEvent::buttonMask = 0; PointerEvent::PointerEvent(int b, int _x, int _y) : - button_tqmask(b), + button_mask(b), x(_x), y(_y) { if (!initialized) { @@ -297,13 +297,13 @@ void PointerEvent::exec() { screen = 0; XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime); for(int i = 0; i < 5; i++) - if ((buttonMask&(1<<i))!=(button_tqmask&(1<<i))) + if ((buttonMask&(1<<i))!=(button_mask&(1<<i))) XTestFakeButtonEvent(dpy, i+1, - (button_tqmask&(1<<i))?True:False, + (button_mask&(1<<i))?True:False, CurrentTime); - buttonMask = button_tqmask; + buttonMask = button_mask; } @@ -450,7 +450,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) server->desktopName = desktopName.latin1(); if (!myCursor) - myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) tqmask); + myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) mask); server->cursor = myCursor; passwordChanged(); diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h index d0d8af36..2316b7af 100644 --- a/krfb/krfb/rfbcontroller.h +++ b/krfb/krfb/rfbcontroller.h @@ -77,7 +77,7 @@ public: }; class PointerEvent : public VNCEvent { - int button_tqmask, x, y; + int button_mask, x, y; static bool initialized; static Display *dpy; @@ -138,7 +138,7 @@ public: void connectionClosed(); bool handleCheckPassword(rfbClientPtr, const char *, int); void handleKeyEvent(bool down, KeySym keySym); - void handlePointerEvent(int button_tqmask, int x, int y); + void handlePointerEvent(int button_mask, int x, int y); enum rfbNewClientAction handleNewClient(rfbClientPtr cl); void clipboardToServer(const TQString &text); void handleClientGone(); diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index d4b520d6..5878b633 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -25,8 +25,8 @@ #include <kiconloader.h> #include <kpopupmenu.h> -KPassivePopup2::KPassivePopup2(TQWidget *tqparent) : - KPassivePopup(tqparent){ +KPassivePopup2::KPassivePopup2(TQWidget *parent) : + KPassivePopup(parent){ } void KPassivePopup2::hideEvent( TQHideEvent *e ) @@ -37,9 +37,9 @@ void KPassivePopup2::hideEvent( TQHideEvent *e ) KPassivePopup2 *KPassivePopup2::message( const TQString &caption, const TQString &text, const TQPixmap &icon, - TQWidget *tqparent) + TQWidget *parent) { - KPassivePopup2 *pop = new KPassivePopup2( tqparent); + KPassivePopup2 *pop = new KPassivePopup2( parent); pop->setView( caption, text, icon ); pop->show(); diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h index 21e7aac2..45e22ea7 100644 --- a/krfb/krfb/trayicon.h +++ b/krfb/krfb/trayicon.h @@ -32,10 +32,10 @@ class KPassivePopup2 : public KPassivePopup { Q_OBJECT TQ_OBJECT public: - KPassivePopup2(TQWidget *tqparent); + KPassivePopup2(TQWidget *parent); static KPassivePopup2 *message( const TQString &caption, const TQString &text, const TQPixmap &icon, - TQWidget *tqparent); + TQWidget *parent); signals: void hidden(); diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index 633cc0fe..f13eaaf9 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -58,7 +58,7 @@ rfbSendtqCursorShape(cl) if ( pCursor && pCursor->width == 1 && pCursor->height == 1 && - pCursor->tqmask[0] == 0 ) { + pCursor->mask[0] == 0 ) { pCursor = NULL; } @@ -150,9 +150,9 @@ rfbSendtqCursorShape(cl) cl->ublen += pCursor->width*bpp2*pCursor->height; } - /* Prepare transparency tqmask. */ + /* Prepare transparency mask. */ - bitmapData = (CARD8 *)pCursor->tqmask; + bitmapData = (CARD8 *)pCursor->mask; for (i = 0; i < pCursor->height; i++) { for (j = 0; j < bitmapRowBytes; j++) { @@ -199,7 +199,7 @@ rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged) if ( pCursor && pCursor->width <= 1 && pCursor->height <= 1 && - pCursor->tqmask[0] == 0 ) { + pCursor->mask[0] == 0 ) { pCursor = NULL; } @@ -365,12 +365,12 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt if(*cp!=' ') cursor->source[j*w+i/8]|=bit; if(maskString) { - cursor->tqmask = (unsigned char*)calloc(w,height); + cursor->mask = (unsigned char*)calloc(w,height); for(j=0,cp=maskString;j<height;j++) for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) - if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; + if(*cp!=' ') cursor->mask[j*w+i/8]|=bit; } else - cursor->tqmask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source); + cursor->mask = (unsigned char*)rfbMakeMaskForXCursor(width,height,cursor->source); return(cursor); } @@ -378,7 +378,7 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt char* rfbMakeMaskForXCursor(int width,int height,char* source) { int i,j,w=(width+7)/8; - char* tqmask=(char*)calloc(w,height); + char* mask=(char*)calloc(w,height); unsigned char c; for(j=0;j<height;j++) @@ -388,14 +388,14 @@ char* rfbMakeMaskForXCursor(int width,int height,char* source) if(j<height-1) c|=source[(j+1)*w+i]; if(i>0 && (c&0x80)) - tqmask[j*w+i-1]|=0x01; + mask[j*w+i-1]|=0x01; if(i<w-1 && (c&0x01)) - tqmask[j*w+i+1]|=0x80; + mask[j*w+i+1]|=0x80; - tqmask[j*w+i]|=(c<<1)|c|(c>>1); + mask[j*w+i]|=(c<<1)|c|(c>>1); } - return(tqmask); + return(mask); } void rfbFreeCursor(rfbCursorPtr cursor) @@ -404,7 +404,7 @@ void rfbFreeCursor(rfbCursorPtr cursor) if(cursor->richSource) free(cursor->richSource); free(cursor->source); - free(cursor->tqmask); + free(cursor->mask); free(cursor); } @@ -497,7 +497,7 @@ void MakeSoftCursor(rfbClientPtr cl, rfbCursorPtr cursor) for(j=0;j<cursor->height;j++) for(i=0,bit=0x80;i<cursor->width;i++,bit=(bit&1)?0x80:bit>>1) - if(cursor->tqmask[j*w+i/8]&bit) { + if(cursor->mask[j*w+i/8]&bit) { if (state) { memcpy(cp,sp,bpp); cp += bpp; @@ -634,7 +634,7 @@ void rfbDrawCursor(rfbScreenInfoPtr s) /* now the cursor has to be drawn */ for(j=0;j<y2;j++) for(i=0;i<x2;i++) - if((c->tqmask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80) + if((c->mask[(j+j1)*w+(i+i1)/8]<<((i+i1)&7))&0x80) memcpy(s->frameBuffer+(j+y1)*rowstride+(i+x1)*bpp, c->richSource+(j+j1)*c->width*bpp+(i+i1)*bpp,bpp); @@ -655,7 +655,7 @@ void rfbPrintXCursor(rfbCursorPtr cursor) if(cursor->source[j*w+i]&bit) putchar('#'); else putchar(' '); putchar(':'); for(i=0,i1=0,bit=0x80;i1<cursor->width;i1++,i+=(bit&1)?1:0,bit=(bit&1)?0x80:bit>>1) - if(cursor->tqmask[j*w+i]&bit) putchar('#'); else putchar(' '); + if(cursor->mask[j*w+i]&bit) putchar('#'); else putchar(' '); putchar('\n'); } } diff --git a/krfb/libvncserver/example.c b/krfb/libvncserver/example.c index 63f58e21..1cdda701 100644 --- a/krfb/libvncserver/example.c +++ b/krfb/libvncserver/example.c @@ -252,7 +252,7 @@ int main(int argc,char** argv) initBuffer(rfbScreen->frameBuffer); rfbDrawString(rfbScreen,&radonFont,20,100,"Hello, World!",0xffffff); - /* This call creates a tqmask and then a cursor: */ + /* This call creates a mask and then a cursor: */ /* rfbScreen->defaultCursor = rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0); */ diff --git a/krfb/libvncserver/main.c b/krfb/libvncserver/main.c index c9bde3fe..207e512d 100644 --- a/krfb/libvncserver/main.c +++ b/krfb/libvncserver/main.c @@ -413,12 +413,12 @@ static rfbCursor myCursor = static rfbCursor myCursor = { source: "\000\102\044\030\044\102\000", - tqmask: "\347\347\176\074\176\347\347", + mask: "\347\347\176\074\176\347\347", width: 8, height: 7, xhot: 3, yhot: 3, /* width: 8, height: 7, xhot: 0, yhot: 0, source: "\000\074\176\146\176\074\000", - tqmask: "\176\377\377\377\377\377\176", + mask: "\176\377\377\377\377\377\176", */ foreRed: 0, foreGreen: 0, foreBlue: 0, backRed: 0xffff, backGreen: 0xffff, backBlue: 0xffff, diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index ef79227c..2131c7a8 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -733,7 +733,7 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h); typedef struct rfbCursor { unsigned char *source; /* points to bits */ - unsigned char *tqmask; /* points to bits */ + unsigned char *mask; /* points to bits */ unsigned short width, height, xhot, yhot; /* metrics */ unsigned short foreRed, foreGreen, foreBlue; /* device-independent colour */ unsigned short backRed, backGreen, backBlue; /* device-independent colour */ diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h index 70ad2a1a..e511006e 100644 --- a/krfb/libvncserver/rfbproto.h +++ b/krfb/libvncserver/rfbproto.h @@ -442,11 +442,11 @@ typedef struct { * the last tile in each row will be correspondingly smaller. Similarly if the * height is not an exact multiple of 16 then the height of each tile in the * final row will also be smaller. Each tile begins with a "subencoding" type - * byte, which is a tqmask made up of a number of bits. If the Raw bit is set + * byte, which is a mask made up of a number of bits. If the Raw bit is set * then the other bits are irrelevant; w*h pixel values follow (where w and h * are the width and height of the tile). Otherwise the tile is encoded in a * similar way to RRE, except that the position and size of each subrectangle - * can be specified in just two bytes. The other bits in the tqmask are as + * can be specified in just two bytes. The other bits in the mask are as * follows: * * BackgroundSpecified - if set, a pixel value follows which specifies @@ -589,10 +589,10 @@ typedef struct { CARD16 imageLength; /* * Followed by an image of the cursor in the client's image format - * with the following RLE tqmask compression. It begins with CARD8 that - * specifies the number of tqmask'ed pixels that will be NOT transmitted. - * Then follows a CARD8 that specified by the number of untqmask'd pixels - * that will be transmitted next. Then a CARD8 with the number of tqmask'd + * with the following RLE mask compression. It begins with CARD8 that + * specifies the number of mask'ed pixels that will be NOT transmitted. + * Then follows a CARD8 that specified by the number of unmask'd pixels + * that will be transmitted next. Then a CARD8 with the number of mask'd * pixels and so on. */ } rfbSoftCursorSetImage; diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c index bef8f825..9dd743ac 100644 --- a/krfb/libvncserver/tight.c +++ b/krfb/libvncserver/tight.c @@ -1239,7 +1239,7 @@ EncodeMonoRect##bpp(buf, w, h) \ { \ CARD##bpp *ptr; \ CARD##bpp bg; \ - unsigned int value, tqmask; \ + unsigned int value, mask; \ int aligned_width; \ int x, y, bg_bits; \ \ @@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \ *buf++ = 0; \ continue; \ } \ - tqmask = 0x80 >> bg_bits; \ - value = tqmask; \ + mask = 0x80 >> bg_bits; \ + value = mask; \ for (bg_bits++; bg_bits < 8; bg_bits++) { \ - tqmask >>= 1; \ + mask >>= 1; \ if (*ptr++ != bg) { \ - value |= tqmask; \ + value |= mask; \ } \ } \ *buf++ = (CARD8)value; \ } \ \ - tqmask = 0x80; \ + mask = 0x80; \ value = 0; \ if (x >= w) \ continue; \ \ for (; x < w; x++) { \ if (*ptr++ != bg) { \ - value |= tqmask; \ + value |= mask; \ } \ - tqmask >>= 1; \ + mask >>= 1; \ } \ *buf++ = (CARD8)value; \ } \ diff --git a/krfb/libvncserver/vncev.c b/krfb/libvncserver/vncev.c index e2d9bf99..ba00f9c8 100644 --- a/krfb/libvncserver/vncev.c +++ b/krfb/libvncserver/vncev.c @@ -78,7 +78,7 @@ void doptr(int buttonMask,int x,int y,rfbClientPtr cl) { char buffer[1024]; if(buttonMask) { - sprintf(buffer,"Ptr: mouse button tqmask 0x%x at %d,%d",buttonMask,x,y); + sprintf(buffer,"Ptr: mouse button mask 0x%x at %d,%d",buttonMask,x,y); output(cl->screen,buffer); } diff --git a/krfb/libvncserver/x11vnc.c b/krfb/libvncserver/x11vnc.c index 47d46ae8..4e298f4a 100644 --- a/krfb/libvncserver/x11vnc.c +++ b/krfb/libvncserver/x11vnc.c @@ -263,7 +263,7 @@ int probeX=0,probeY=0; void probeScreen(rfbScreenInfoPtr s,int xscreen) { int i,j,/*pixel,i1,*/j1, - bpp=s->rfbServerFormat.bitsPerPixel/8,/*tqmask=(1<<bpp)-1,*/ + bpp=s->rfbServerFormat.bitsPerPixel/8,/*mask=(1<<bpp)-1,*/ rstride=s->paddedWidthInBytes; XImage* im; //fprintf(stderr,"/%d,%d",probeX,probeY); @@ -433,20 +433,20 @@ int main(int argc,char** argv) } } else { screen->rfbServerFormat.redShift = 0; - if ( framebufferImage->red_tqmask ) - while ( ! ( framebufferImage->red_tqmask & (1 << screen->rfbServerFormat.redShift) ) ) + if ( framebufferImage->red_mask ) + while ( ! ( framebufferImage->red_mask & (1 << screen->rfbServerFormat.redShift) ) ) screen->rfbServerFormat.redShift++; screen->rfbServerFormat.greenShift = 0; - if ( framebufferImage->green_tqmask ) - while ( ! ( framebufferImage->green_tqmask & (1 << screen->rfbServerFormat.greenShift) ) ) + if ( framebufferImage->green_mask ) + while ( ! ( framebufferImage->green_mask & (1 << screen->rfbServerFormat.greenShift) ) ) screen->rfbServerFormat.greenShift++; screen->rfbServerFormat.blueShift = 0; - if ( framebufferImage->blue_tqmask ) - while ( ! ( framebufferImage->blue_tqmask & (1 << screen->rfbServerFormat.blueShift) ) ) + if ( framebufferImage->blue_mask ) + while ( ! ( framebufferImage->blue_mask & (1 << screen->rfbServerFormat.blueShift) ) ) screen->rfbServerFormat.blueShift++; - screen->rfbServerFormat.redMax = framebufferImage->red_tqmask >> screen->rfbServerFormat.redShift; - screen->rfbServerFormat.greenMax = framebufferImage->green_tqmask >> screen->rfbServerFormat.greenShift; - screen->rfbServerFormat.blueMax = framebufferImage->blue_tqmask >> screen->rfbServerFormat.blueShift; + screen->rfbServerFormat.redMax = framebufferImage->red_mask >> screen->rfbServerFormat.redShift; + screen->rfbServerFormat.greenMax = framebufferImage->green_mask >> screen->rfbServerFormat.greenShift; + screen->rfbServerFormat.blueMax = framebufferImage->blue_mask >> screen->rfbServerFormat.blueShift; } backupImage = malloc(screen->height*screen->paddedWidthInBytes); diff --git a/krfb/srvloc/getifaddrs.h b/krfb/srvloc/getifaddrs.h index d169b8e4..d0514eca 100644 --- a/krfb/srvloc/getifaddrs.h +++ b/krfb/srvloc/getifaddrs.h @@ -56,7 +56,7 @@ struct kde_ifaddrs unsigned int ifa_flags; /* Flags as from SIOCGIFFLAGS ioctl. */ struct sockaddr *ifa_addr; /* Network address of this interface. */ - struct sockaddr *ifa_netmask; /* Nettqmask of this interface. */ + struct sockaddr *ifa_netmask; /* Netmask of this interface. */ union { /* At most one of the following two is valid. If the IFF_BROADCAST 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(); diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 19e02f60..4a3947da 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -29,9 +29,9 @@ #include <stdlib.h> #include <klocale.h> // for getenv -KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *tqparent, const char* name, +KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, KSimpleConfig *_config) - : KCModule (tqparent, name) + : KCModule (parent, name) { if (!_config) { delete_config = true; diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h index 7a5f0cd4..6cdb4600 100644 --- a/ktalkd/kcmktalkd/answmachpage.h +++ b/ktalkd/kcmktalkd/answmachpage.h @@ -45,7 +45,7 @@ class KAnswmachPageConfig : public KCModule TQ_OBJECT public: - KAnswmachPageConfig( TQWidget *tqparent=0, const char* name=0, + KAnswmachPageConfig( TQWidget *parent=0, const char* name=0, KSimpleConfig *config=0 ); ~KAnswmachPageConfig( ); diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index fb04bf7f..2046833d 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -26,9 +26,9 @@ #include <ksimpleconfig.h> #include <klocale.h> -KForwmachPageConfig::KForwmachPageConfig( TQWidget *tqparent, const char* name, +KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, KSimpleConfig *_config) - : KCModule (tqparent, name) + : KCModule (parent, name) { if (!_config) { delete_config = true; diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h index 7811eb71..ccee8844 100644 --- a/ktalkd/kcmktalkd/forwmachpage.h +++ b/ktalkd/kcmktalkd/forwmachpage.h @@ -45,7 +45,7 @@ class KForwmachPageConfig : public KCModule TQ_OBJECT public: - KForwmachPageConfig( TQWidget *tqparent=0, const char* name=0, + KForwmachPageConfig( TQWidget *parent=0, const char* name=0, KSimpleConfig *config=0); ~KForwmachPageConfig( ); diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index a1ff8878..bd68e17a 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -30,8 +30,8 @@ #include <tqtabwidget.h> #include <tqlayout.h> -KTalkdConfigModule::KTalkdConfigModule(TQWidget *tqparent, const char *name) - : KCModule(tqparent, name) +KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) + : KCModule(parent, name) { config = new KSimpleConfig("ktalkdrc"); announceconfig = new KSimpleConfig("ktalkannouncerc"); @@ -88,24 +88,24 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *) extern "C" { - KDE_EXPORT KCModule *create_ktalkd(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_ktalkd(TQWidget *parent, const char *) { - return new KTalkdConfigModule(tqparent, "kcmktalkd"); + return new KTalkdConfigModule(parent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *parent, const char *) { - return new KAnswmachPageConfig(tqparent, "kcmktalkd"); + return new KAnswmachPageConfig(parent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *parent, const char *) { - return new KSoundPageConfig(tqparent, "kcmktalkd"); + return new KSoundPageConfig(parent, "kcmktalkd"); } - KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *parent, const char *) { - return new KForwmachPageConfig(tqparent, "kcmktalkd"); + return new KForwmachPageConfig(parent, "kcmktalkd"); } } diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h index 1fb1c910..6d5e8f52 100644 --- a/ktalkd/kcmktalkd/main.h +++ b/ktalkd/kcmktalkd/main.h @@ -39,7 +39,7 @@ class KTalkdConfigModule : public KCModule public: - KTalkdConfigModule(TQWidget *tqparent, const char *name); + KTalkdConfigModule(TQWidget *parent, const char *name); virtual ~KTalkdConfigModule(); //void init(); diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index 8e812a58..26b82f59 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -44,9 +44,9 @@ /* Lots of stuff taken from syssound.cpp */ -KSoundPageConfig::KSoundPageConfig( TQWidget *tqparent, const char* name, +KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, KSimpleConfig *_config, KSimpleConfig *_announceconfig) - : KCModule (tqparent, name) + : KCModule (parent, name) { if (!_config) { delete_config = true; diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h index 2c19ee66..cd07991c 100644 --- a/ktalkd/kcmktalkd/soundpage.h +++ b/ktalkd/kcmktalkd/soundpage.h @@ -49,7 +49,7 @@ class KSoundPageConfig : public KCModule TQ_OBJECT public: - KSoundPageConfig( TQWidget *tqparent=0, const char* name=0, + KSoundPageConfig( TQWidget *parent=0, const char* name=0, KSimpleConfig *config=0, KSimpleConfig *announceconfig=0); ~KSoundPageConfig( ); diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp index 1970b92d..d21f27f4 100644 --- a/ktalkd/ktalkd/announce.cpp +++ b/ktalkd/ktalkd/announce.cpp @@ -97,7 +97,7 @@ int announce(NEW_CTL_MSG *request, const char *remote_machine, char *disp, int request->r_name, remote_machine); } else { if ((pid = fork())) { - /* we are the tqparent, so wait for the child */ + /* we are the parent, so wait for the child */ if (pid == -1) /* the fork failed */ return (FAILED); status = wait_process(pid); @@ -242,7 +242,7 @@ int try_Xannounce(NEW_CTL_MSG *request, const char *remote_machine, new_process(); /* * I don't know any way how to find that external program run ok - * so tqparent returns always SUCCESS + * so parent returns always SUCCESS * Well I know a solution - read the pipe :-) - It blocks, so * we can't wait the reaction of the user * @@ -451,7 +451,7 @@ int play_sound(int usercfg) ktalk_debug(sSoundFile); if ((pid = fork())) { - /* we are the tqparent, so wait for the child */ + /* we are the parent, so wait for the child */ if (pid == -1) /* the fork failed */ { syslog(LOG_ERR,"Fork before play_sound : FAILED."); diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp index f94c15d4..402e4f01 100644 --- a/ktalkd/ktalkd/machines/forwmach.cpp +++ b/ktalkd/ktalkd/machines/forwmach.cpp @@ -224,14 +224,14 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller) int socktA = tcAnsw->get_sockt(); int max_sockt = (socktC>socktA) ? socktC : socktA; unsigned char buf[BUFSIZ]; - fd_set read_tqmask; + fd_set read_mask; int nb; int nbtot = 0; for (;;) { - FD_ZERO(&read_tqmask); - FD_SET(socktA, &read_tqmask); // wait on both connections - FD_SET(socktC, &read_tqmask); - nb = select(max_sockt+1, &read_tqmask, NULL, NULL, NULL); // no timeout + FD_ZERO(&read_mask); + FD_SET(socktA, &read_mask); // wait on both connections + FD_SET(socktC, &read_mask); + nb = select(max_sockt+1, &read_mask, NULL, NULL, NULL); // no timeout if (nb <= 0) { if (errno == EINTR) { continue; @@ -239,12 +239,12 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller) /* panic, we don't know what happened */ TalkConnection::p_error("Unexpected error from select"); } - if (FD_ISSET(socktA, &read_tqmask)) { + if (FD_ISSET(socktA, &read_mask)) { /* There is data on sockt A */ nb = transmit_chars(socktA, socktC, buf); if (nb==0) return ; } - if (FD_ISSET(socktC, &read_tqmask)) { + if (FD_ISSET(socktC, &read_mask)) { /* There is data on sockt C */ nb = transmit_chars(socktC, socktA, buf); if (nb==0) return ; @@ -284,7 +284,7 @@ void ForwMachine::sendResponse(const struct talk_addr target, NEW_CTL_RESPONSE * * value of answ_id_num) and waits for SIGDELETE to use this value. */ void ForwMachine::processAnnounce() { - if ((pid=fork())==0) // store pid in the tqparent + if ((pid=fork())==0) // store pid in the parent { // Send announce to the answerer, and wait for response ktalk_debug("-------------- ForwMachine : sending ANNOUNCE to %s",answ_user); diff --git a/ktalkd/ktalkd/machines/talkconn.cpp b/ktalkd/ktalkd/machines/talkconn.cpp index c7b8e738..b2e5710a 100644 --- a/ktalkd/ktalkd/machines/talkconn.cpp +++ b/ktalkd/ktalkd/machines/talkconn.cpp @@ -247,13 +247,13 @@ void TalkConnection::findProtocol() { daemon.sin_addr = his_machine_addr; /* Prepare the variables used for reading on sockets */ - fd_set read_tqmask, ctl_tqmask; + fd_set read_mask, ctl_mask; int nready=0, cc; struct timeval wait; - FD_ZERO(&ctl_tqmask); - FD_SET(new_socket, &ctl_tqmask); - FD_SET(old_socket, &ctl_tqmask); + FD_ZERO(&ctl_mask); + FD_SET(new_socket, &ctl_mask); + FD_SET(old_socket, &ctl_mask); int max_socket = (new_socket > old_socket) ? new_socket : old_socket; /* Method : we send the two packets to the two remote daemons. @@ -279,10 +279,10 @@ void TalkConnection::findProtocol() { do { /* Wait for response */ - read_tqmask = ctl_tqmask; + read_mask = ctl_mask; wait.tv_sec = CTL_WAIT; wait.tv_usec = 0; - nready = ::select(max_socket+1, &read_tqmask, 0, 0, &wait); + nready = ::select(max_socket+1, &read_mask, 0, 0, &wait); if (nready < 0) { if (errno == EINTR) continue; @@ -292,7 +292,7 @@ void TalkConnection::findProtocol() { if (nready == 0) ktalk_debug("select returned 0 ! "); /* Analyze response */ - if (FD_ISSET(old_socket, &read_tqmask)) { + if (FD_ISSET(old_socket, &read_mask)) { ktalk_debug("Reading on old_socket"); cc = ::recv(old_socket, (char *)&old_resp, sizeof (old_resp), 0); if (cc < 0) { @@ -302,7 +302,7 @@ void TalkConnection::findProtocol() { } else if (old_resp.type == LOOK_UP) protocol=talkProtocol; // FOUND } - if (FD_ISSET(new_socket, &read_tqmask)) { + if (FD_ISSET(new_socket, &read_mask)) { ktalk_debug("Reading on new_socket"); cc = ::recv(new_socket, (char *)&new_resp, sizeof (new_resp), 0); if (cc < 0) { @@ -364,7 +364,7 @@ void TalkConnection::ctl_transact(int type, int id_num) * Let's check it, the way ktalk does. */ findProtocol(); - fd_set read_tqmask, ctl_tqmask; + fd_set read_mask, ctl_mask; int nready=0, cc, size, ok=0; struct timeval wait; struct sockaddr_in daemon_addr; @@ -386,8 +386,8 @@ void TalkConnection::ctl_transact(int type, int id_num) daemon_addr.sin_family = AF_INET; daemon_addr.sin_addr = his_machine_addr; daemon_addr.sin_port = (protocol == talkProtocol) ? talkDaemonPort : ntalkDaemonPort; - FD_ZERO(&ctl_tqmask); - FD_SET(ctl_sockt, &ctl_tqmask); + FD_ZERO(&ctl_mask); + FD_SET(ctl_sockt, &ctl_mask); /* Keep sending the message until a response of * the proper type is obtained. @@ -403,10 +403,10 @@ void TalkConnection::ctl_transact(int type, int id_num) continue; p_error("Error on write to talk daemon"); } - read_tqmask = ctl_tqmask; + read_mask = ctl_mask; wait.tv_sec = CTL_WAIT; wait.tv_usec = 0; - nready = ::select(ctl_sockt+1, &read_tqmask, 0, 0, &wait); + nready = ::select(ctl_sockt+1, &read_mask, 0, 0, &wait); if (nready < 0) { if (errno == EINTR) continue; @@ -429,10 +429,10 @@ void TalkConnection::ctl_transact(int type, int id_num) continue; p_error("Error on read from talk daemon"); } - read_tqmask = ctl_tqmask; + read_mask = ctl_mask; /* an immediate poll */ timerclear(&wait); - nready = ::select(ctl_sockt+1, &read_tqmask, 0, 0, &wait); + nready = ::select(ctl_sockt+1, &read_mask, 0, 0, &wait); if (protocol == talkProtocol) ok = (old_resp.type == type); else ok = ((new_resp.type == type) && (new_resp.vers == TALK_VERSION)); } while (nready > 0 && (!ok)); diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index 3ca199fb..b7fa0684 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -47,10 +47,10 @@ class TimeoutDialog : public TQMessageBox { TimeoutDialog (int timeout_ms, const TQString& caption, const TQString &text, Icon icon, int button0, int button1, int button2, - TQWidget *tqparent=0, const char *name=0, bool modal=TRUE, + TQWidget *parent=0, const char *name=0, bool modal=TRUE, WFlags f=WStyle_DialogBorder ): TQMessageBox (caption, text, icon, button0, button1, button2, - tqparent, name, modal, f) + parent, name, modal, f) {startTimer (timeout_ms);} ~TimeoutDialog () diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index 61996018..d7437848 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -128,10 +128,10 @@ NICList* findNICs() if (result==0) { sinptr = (struct sockaddr_in *) &ifcopy.ifr_addr; - tmp->nettqmask=inet_ntoa(sinptr->sin_addr); + tmp->netmask=inet_ntoa(sinptr->sin_addr); } else - tmp->nettqmask=i18n("Unknown"); + tmp->netmask=i18n("Unknown"); nl->append(tmp); break; @@ -159,14 +159,14 @@ NICList* findNICs() getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); tmp->addr = buf; - if (ifa->ifa_nettqmask != NULL) { + if (ifa->ifa_netmask != NULL) { #ifdef Q_OS_FREEBSD - struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_nettqmask; - tmp->nettqmask=inet_ntoa(sinptr->sin_addr); + struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask; + tmp->netmask=inet_ntoa(sinptr->sin_addr); #else bzero(buf, 128); - getnameinfo(ifa->ifa_nettqmask, ifa->ifa_nettqmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); - tmp->nettqmask = buf; + getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); + tmp->netmask = buf; #endif } @@ -193,12 +193,12 @@ NICList* findNICs() void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci) { TQString ip=addrMask.left(addrMask.find("/")); - TQString tqmask=addrMask.mid(addrMask.find("/")+1); + TQString mask=addrMask.mid(addrMask.find("/")+1); - if (tqmask[tqmask.length()-1]==';') - tqmask=tqmask.left(tqmask.length()-1); + if (mask[mask.length()-1]==';') + mask=mask.left(mask.length()-1); MyNIC tmpNic; - KInetSocketAddress::stringToAddr(AF_INET, tqmask.latin1(), &tmpNic.nettqmask); + KInetSocketAddress::stringToAddr(AF_INET, mask.latin1(), &tmpNic.netmask); KInetSocketAddress::stringToAddr(AF_INET, ip.latin1(), &tmpNic.addr); suggestSettingsForNic(&tmpNic,lci); } @@ -209,11 +209,11 @@ void suggestSettingsForNic(MyNIC* nic, LisaConfigInfo& lci) if (nic==0) return; TQString address = nic->addr; - TQString nettqmask = nic->nettqmask; + TQString netmask = nic->netmask; - TQString addrMask(address+"/"+nettqmask+";"); + TQString addrMask(address+"/"+netmask+";"); struct in_addr tmpaddr; - inet_aton(nic->nettqmask.latin1(), &tmpaddr); + inet_aton(nic->netmask.latin1(), &tmpaddr); unsigned int tmp= ntohl(tmpaddr.s_addr); //if the host part is less than 20 bits simply take it diff --git a/lanbrowsing/kcmlisa/findnic.h b/lanbrowsing/kcmlisa/findnic.h index 0e9453c0..bff0aabb 100644 --- a/lanbrowsing/kcmlisa/findnic.h +++ b/lanbrowsing/kcmlisa/findnic.h @@ -32,7 +32,7 @@ struct MyNIC { TQString name; TQString addr; - TQString nettqmask; + TQString netmask; TQString state; TQString type; }; diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index d1c0c4f7..2f02e2fa 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -31,8 +31,8 @@ #include <kdebug.h> #include <kdialog.h> -IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *tqparent) -:KCModule(tqparent) +IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) +:KCModule(parent) ,m_config(config,false,true) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h index 9fc4da67..de57af86 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.h +++ b/lanbrowsing/kcmlisa/kcmkiolan.h @@ -33,7 +33,7 @@ class IOSlaveSettings:public KCModule Q_OBJECT TQ_OBJECT public: - IOSlaveSettings(const TQString& config, TQWidget *tqparent=0); + IOSlaveSettings(const TQString& config, TQWidget *parent=0); virtual ~IOSlaveSettings() {}; void load(); void save(); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 36ab9ba6..01bf9bc2 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -48,8 +48,8 @@ #include <kdebug.h> -LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) -: KCModule(tqparent, "kcmlanbrowser") +LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) +: KCModule(parent, "kcmlanbrowser") ,m_config(config,false,true) ,m_wizard(0) ,m_configFilename(config) @@ -86,7 +86,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) tqlayout->setStretchFactor(addressesGrid,0); label=new TQLabel(i18n("&Broadcast network address:"),addressesGrid); - comment=i18n("Your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + comment=i18n("Your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_broadcastNetwork=new KRestrictedLine(addressesGrid,"a","0123456789./;"); @@ -94,7 +94,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent) label->setBuddy(m_broadcastNetwork); label=new TQLabel(i18n("&Trusted IP addresses:"),addressesGrid); - comment = i18n("Usually your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(addressesGrid,"a","0123456789./;"); @@ -335,7 +335,7 @@ void LisaSettings::suggestSettings() //not that easy to handle for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) { - msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->nettqmask+";<br>"; + msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>"; } KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg)); } diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index af576ca1..e3fbf46c 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -39,7 +39,7 @@ class LisaSettings:public KCModule Q_OBJECT TQ_OBJECT public: - LisaSettings(const TQString& config, TQWidget *tqparent=0); + LisaSettings(const TQString& config, TQWidget *parent=0); virtual ~LisaSettings() {}; void load(); void save(); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 06342be4..1ced6c13 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -36,8 +36,8 @@ #include <krestrictedline.h> #include <keditlistbox.h> -ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *tqparent) -: KCModule(tqparent) +ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) +: KCModule(parent) ,m_config(config,false,true) ,m_kiolanConfig("kio_lanrc",false,true) ,m_advancedSettingsButton(0) @@ -68,7 +68,7 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *tqparent) TQHBox *hbox=new TQHBox(this); hbox->setSpacing(10); TQLabel *label=new TQLabel(i18n("&Trusted addresses:"),hbox); - TQString comment = i18n("Usually your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)"); + TQString comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(hbox,"a","0123456789./;"); TQToolTip::add(m_allowedAddresses,comment); @@ -218,8 +218,8 @@ void ResLisaSettings::suggestSettings() MyNIC *nic=nics->first(); TQString address = nic->addr; - TQString nettqmask = nic->nettqmask; - m_allowedAddresses->setText(address+"/"+nettqmask+";"); + TQString netmask = nic->netmask; + m_allowedAddresses->setText(address+"/"+netmask+";"); m_secondWait->setValue(0); m_secondScan->setChecked(FALSE); m_secondWait->setEnabled(FALSE); @@ -235,7 +235,7 @@ void ResLisaSettings::suggestSettings() //not that easy to handle for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) { - msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->nettqmask+";<br>"; + msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>"; } KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg)); } diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h index 68cd8f4f..ae079784 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.h +++ b/lanbrowsing/kcmlisa/kcmreslisa.h @@ -37,7 +37,7 @@ class ResLisaSettings:public KCModule Q_OBJECT TQ_OBJECT public: - ResLisaSettings(const TQString& config, TQWidget *tqparent=0); + ResLisaSettings(const TQString& config, TQWidget *parent=0); virtual ~ResLisaSettings() {} void load(); void save(); diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp index 83d80ab5..00d03e52 100644 --- a/lanbrowsing/kcmlisa/main.cpp +++ b/lanbrowsing/kcmlisa/main.cpp @@ -33,17 +33,17 @@ extern "C" { - KDE_EXPORT KCModule *create_lisa(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *) { - return new LisaSettings("/etc/lisarc", tqparent); + return new LisaSettings("/etc/lisarc", parent); } - KDE_EXPORT KCModule *create_reslisa(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *) { - return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", tqparent); + return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent); } - KDE_EXPORT KCModule *create_kiolan(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *) { - return new IOSlaveSettings("kio_lanrc", tqparent); + return new IOSlaveSettings("kio_lanrc", parent); } } diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp index 1b3e7c1b..3e94c730 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.cpp +++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> -PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *tqparent) -:TQHBox(tqparent) +PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *parent) +:TQHBox(parent) { TQLabel* label=new TQLabel(title, this); m_box=new TQComboBox(this); diff --git a/lanbrowsing/kcmlisa/portsettingsbar.h b/lanbrowsing/kcmlisa/portsettingsbar.h index bc674788..c2571e94 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.h +++ b/lanbrowsing/kcmlisa/portsettingsbar.h @@ -33,7 +33,7 @@ class PortSettingsBar:public TQHBox Q_OBJECT TQ_OBJECT public: - PortSettingsBar(const TQString& title, TQWidget *tqparent=0); + PortSettingsBar(const TQString& title, TQWidget *parent=0); virtual ~PortSettingsBar() {}; int selected() const; void setChecked(int what); diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index 82873c00..f5b985e1 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -31,8 +31,8 @@ #include <netinet/in.h> #include <arpa/inet.h> -SetupWizard::SetupWizard(TQWidget* tqparent, LisaConfigInfo* configInfo) - :TQWizard(tqparent,"hallo",true) +SetupWizard::SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo) + :TQWizard(parent,"hallo",true) ,m_page1(0) ,m_noNicPage(0) ,m_multiNicPage(0) @@ -208,12 +208,12 @@ void SetupWizard::setupAddressesPage() { m_addressesPage=new TQVBox(this); TQLabel *info=new TQLabel(i18n("All IP addresses included in the specified range will be pinged.<br>" - "If you are part of a small network, e.g. with network tqmask 255.255.255.0<br>" - "use your IP address/network tqmask.<br>"),m_addressesPage); + "If you are part of a small network, e.g. with network mask 255.255.255.0<br>" + "use your IP address/network mask.<br>"),m_addressesPage); info->setTextFormat(TQt::RichText); m_pingAddresses=new KRestrictedLine(m_addressesPage,"0123456789./;-"); info=new TQLabel(i18n("<br>There are four ways to specify address ranges:<br>" - "1. IP address/network tqmask, like <code>192.168.0.0/255.255.255.0;</code><br>" + "1. IP address/network mask, like <code>192.168.0.0/255.255.255.0;</code><br>" "2. single IP addresses, like <code>10.0.0.23;</code><br>" "3. continuous ranges, like <code>10.0.1.0-10.0.1.200;</code><br>" "4. ranges for each part of the address, like <code>10-10.1-5.1-25.1-3;</code><br>" @@ -237,7 +237,7 @@ void SetupWizard::setupAllowedPage() "It provides a simple IP address based way to specify \"trusted\" hosts.<br>" "Only hosts which fit into the addresses given here are accepted by LISa as clients. " "The list of hosts published by LISa will also only contain hosts which fit into this scheme.<br>" - "Usually you enter your IP address/network tqmask here."),m_allowedAddressesPage); + "Usually you enter your IP address/network mask here."),m_allowedAddressesPage); info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;"); m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage); @@ -255,7 +255,7 @@ void SetupWizard::setupAllowedPage() void SetupWizard::setupBcastPage() { m_bcastPage=new TQVBox(this); - TQLabel *info=new TQLabel(i18n("<br>Enter your IP address and network tqmask here, like <code>192.168.0.1/255.255.255.0</code>"),m_bcastPage); + TQLabel *info=new TQLabel(i18n("<br>Enter your IP address and network mask here, like <code>192.168.0.1/255.255.255.0</code>"),m_bcastPage); info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./"); info=new TQLabel(i18n("<br>To reduce the network load, the LISa servers in one network<br>" @@ -398,7 +398,7 @@ void SetupWizard::next() m_nicListBox->clear(); for (MyNIC *nic=m_nics->first(); nic!=0; nic=m_nics->next()) { - TQString tmp=nic->name+": "+nic->addr+"/"+nic->nettqmask+";"; + TQString tmp=nic->name+": "+nic->addr+"/"+nic->netmask+";"; m_nicListBox->insertItem(tmp); } m_nicListBox->setSelected(0,true); @@ -462,7 +462,7 @@ void SetupWizard::showPage(TQWidget* page) text+=i18n("You can use the same syntax as on the previous page.<br>"); else text+=i18n("There are three ways to specify IP addresses:<br>" - "1. IP address/network tqmask, like<code> 192.168.0.0/255.255.255.0;</code><br>" + "1. IP address/network mask, like<code> 192.168.0.0/255.255.255.0;</code><br>" "2. continuous ranges, like<code> 10.0.1.0-10.0.1.200;</code><br>" "3. single IP addresses, like<code> 10.0.0.23;</code><br>" "You can also enter combinations of 1 to 3, separated by \";\", <br>" diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h index f571bd6e..c67b330b 100644 --- a/lanbrowsing/kcmlisa/setupwizard.h +++ b/lanbrowsing/kcmlisa/setupwizard.h @@ -45,7 +45,7 @@ class SetupWizard:public TQWizard Q_OBJECT TQ_OBJECT public: - SetupWizard(TQWidget* tqparent, LisaConfigInfo* configInfo); + SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo); ~SetupWizard(); virtual void showPage(TQWidget* page); void clearAll(); diff --git a/lanbrowsing/lisa/addressvalidator.cpp b/lanbrowsing/lisa/addressvalidator.cpp index 70207ece..aa292806 100644 --- a/lanbrowsing/lisa/addressvalidator.cpp +++ b/lanbrowsing/lisa/addressvalidator.cpp @@ -33,7 +33,7 @@ using namespace std; AddressValidator::AddressValidator(const MyString& addressSpecs) //this is 127.0.0.0 :localhostNet(htonl(0x7f000000)) -//with tqmask 255.255.255.0 +//with mask 255.255.255.0 ,localhostMask(htonl(0xffffff00)) { clearSpecs(); @@ -44,7 +44,7 @@ AddressValidator::AddressValidator(const MyString& addressSpecs) AddressValidator::AddressValidator() //this is 127.0.0.0 :localhostNet(htonl(0x7f000000)) - //with tqmask 255.255.255.0 + //with mask 255.255.255.0 ,localhostMask(htonl(0xffffff00)) { clearSpecs(); @@ -115,11 +115,11 @@ void AddressValidator::setValidAddresses(MyString addressSpecs) pos=nextPart.find('/'); MyString netStr=nextPart.left(pos); MyString maskStr=nextPart.mid(pos+1); - int tqmask=inet_addr(maskStr.data()); - int net= (inet_addr(netStr.data()) & tqmask); - dcerr<<"setValidAddresses: net/tqmask: " - <<std::ios::hex<<net<<"/"<<tqmask<<std::ios::dec<<std::endl; - addSpec(NETMASK_SPEC,net,tqmask); + int mask=inet_addr(maskStr.data()); + int net= (inet_addr(netStr.data()) & mask); + dcerr<<"setValidAddresses: net/mask: " + <<std::ios::hex<<net<<"/"<<mask<<std::ios::dec<<std::endl; + addSpec(NETMASK_SPEC,net,mask); } } } @@ -130,19 +130,19 @@ void AddressValidator::clearSpecs() for (int i=0; i<MAX_SPECS; i++) { specs[i].address=0; - specs[i].tqmask=0; + specs[i].mask=0; specs[i].typeOfSpec=NO_SPEC; } } -void AddressValidator::addSpec(int type, int address, int tqmask) +void AddressValidator::addSpec(int type, int address, int mask) { for (int i=0; i<MAX_SPECS; i++) { if (specs[i].typeOfSpec==NO_SPEC) { specs[i].address=address; - specs[i].tqmask=tqmask; + specs[i].mask=mask; specs[i].typeOfSpec=type; return; } @@ -155,7 +155,7 @@ int AddressValidator::isValid(int addressNBO) <<std::ios::hex<<addressNBO<<std::ios::dec<<std::endl; //localhost is always allowed dcerr<<"isValid() local net: "<< - std::ios::hex<<localhostNet<<" tqmask: "<<localhostMask<<" AND: "<<(addressNBO & + std::ios::hex<<localhostNet<<" mask: "<<localhostMask<<" AND: "<<(addressNBO & localhostMask)<<std::ios::dec<<std::endl; if ((addressNBO & localhostMask) == localhostNet) return 1; @@ -183,17 +183,17 @@ int AddressValidator::isValid(int addressNBO) else if (specs[i].typeOfSpec==NETMASK_SPEC) { dcerr<<"isValid: ANDing "<< - std::ios::hex<<(addressNBO & specs[i].tqmask)<<" "<< + std::ios::hex<<(addressNBO & specs[i].mask)<<" "<< specs[i].address<<std::ios::dec<<std::endl; - if ((addressNBO & specs[i].tqmask) == specs[i].address) + if ((addressNBO & specs[i].mask) == specs[i].address) { - dcerr<<"isValid: net/tqmask"<<std::endl; + dcerr<<"isValid: net/mask"<<std::endl; return 1; } } else if (specs[i].typeOfSpec==RANGE_SPEC) { - if ((ntohl(addressNBO)>=specs[i].address) && (ntohl(addressNBO)<=specs[i].tqmask)) + if ((ntohl(addressNBO)>=specs[i].address) && (ntohl(addressNBO)<=specs[i].mask)) { dcerr<<"isValid: range"<<std::endl; return 1; @@ -202,19 +202,19 @@ int AddressValidator::isValid(int addressNBO) else if (specs[i].typeOfSpec==MULTIRANGE_SPEC) { unsigned int addr=ntohl(addressNBO); - dcerr<<"isValid ntohl="<<hex<<addr<<" addr: "<<specs[i].address<<" ma: "<<specs[i].tqmask<<dec<<std::endl; - unsigned int tqmask=0x000000ff; + dcerr<<"isValid ntohl="<<hex<<addr<<" addr: "<<specs[i].address<<" ma: "<<specs[i].mask<<dec<<std::endl; + unsigned int mask=0x000000ff; int failure=0; for (int j=0; j<4; j++) { - dcerr<<"isValid "<<hex<<"tqmask="<<tqmask<<" addr="<<(addr&tqmask)<<" addr="<<(specs[i].address & tqmask)<<" ma="<<(specs[i].tqmask&tqmask)<<std::endl; - if (((addr & tqmask) < (specs[i].address & tqmask)) - || ((addr & tqmask) > (specs[i].tqmask & tqmask))) + dcerr<<"isValid "<<hex<<"mask="<<mask<<" addr="<<(addr&mask)<<" addr="<<(specs[i].address & mask)<<" ma="<<(specs[i].mask&mask)<<std::endl; + if (((addr & mask) < (specs[i].address & mask)) + || ((addr & mask) > (specs[i].mask & mask))) { failure=1; break; } - tqmask=tqmask<<8; + mask=mask<<8; } dcerr<<"isValid: multirange"<<std::endl; if (!failure) diff --git a/lanbrowsing/lisa/addressvalidator.h b/lanbrowsing/lisa/addressvalidator.h index c2c332ab..6f1c723e 100644 --- a/lanbrowsing/lisa/addressvalidator.h +++ b/lanbrowsing/lisa/addressvalidator.h @@ -29,7 +29,7 @@ struct AddressSpec { int address; - int tqmask; + int mask; int typeOfSpec; }; @@ -48,7 +48,7 @@ class AddressValidator int localhostNet; int localhostMask; MyString allowedHosts; - void addSpec(int type, int address, int tqmask=0); + void addSpec(int type, int address, int mask=0); AddressSpec specs[MAX_SPECS]; }; diff --git a/lanbrowsing/lisa/client.cpp b/lanbrowsing/lisa/client.cpp index 92b62dc5..21069a17 100644 --- a/lanbrowsing/lisa/client.cpp +++ b/lanbrowsing/lisa/client.cpp @@ -34,8 +34,8 @@ #define dcerr if (LISA_DEBUG==1) std::cerr<<"Client::" -Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete) -:parentServer(tqparent) +Client::Client(NetManager* parent, int socketFD, int closeOnDelete) +:parentServer(parent) ,m_fd(socketFD) ,m_done(0) ,m_closeOnDelete(closeOnDelete) @@ -79,13 +79,13 @@ int Client::tryToGetInfo() /* int pid=fork(); if (pid==-1) { - //tqparent + //parent dcerr<<"NetScanner::scan: error occurred"<<std::endl; return 1; } else if (pid!=0) { - //tqparent + //parent return 1; };*/ //child diff --git a/lanbrowsing/lisa/client.h b/lanbrowsing/lisa/client.h index b6311235..efcf5f86 100644 --- a/lanbrowsing/lisa/client.h +++ b/lanbrowsing/lisa/client.h @@ -23,7 +23,7 @@ class NetManager; class Client { public: - Client(NetManager* tqparent, int socketFD, int closeOnDelete=1); + Client(NetManager* parent, int socketFD, int closeOnDelete=1); Client(); Client(const Client& c); ~Client(); diff --git a/lanbrowsing/lisa/main.cpp b/lanbrowsing/lisa/main.cpp index e75fa0c1..7de59389 100644 --- a/lanbrowsing/lisa/main.cpp +++ b/lanbrowsing/lisa/main.cpp @@ -225,11 +225,11 @@ int main(int argc, char** argv) } } - //fork and let the tqparent exit + //fork and let the parent exit pid_t pid=fork(); if (pid>0) { - //this is the tqparent + //this is the parent exit(0); } else if (pid<0) diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp index 46002ed1..e652ce97 100644 --- a/lanbrowsing/lisa/netmanager.cpp +++ b/lanbrowsing/lisa/netmanager.cpp @@ -142,11 +142,11 @@ void NetManager::configure(Config& config) MyString netAddressStr=tmp.left(tmp.find('/')); tmp=tmp.mid(tmp.find('/')+1); tmp=tmp.left(tmp.find(';')); - mdcerr<<"NetManager::readConfig: broadcastNet "<<netAddressStr<<" with tqmask "<<tmp<<std::endl; + mdcerr<<"NetManager::readConfig: broadcastNet "<<netAddressStr<<" with mask "<<tmp<<std::endl; int netMask=inet_addr(tmp.c_str()); int netAddress=inet_addr(netAddressStr.c_str()); m_broadcastAddress= netAddress | (~netMask); - mdcerr<<"NetManager::readConfig: net "<<std::ios::hex<<netAddress<<" with tqmask "<<netMask<<" gives "<<m_broadcastAddress<<std::endl; + mdcerr<<"NetManager::readConfig: net "<<std::ios::hex<<netAddress<<" with mask "<<netMask<<" gives "<<m_broadcastAddress<<std::endl; //maybe this way we can avoid that all servers on the net send //their requests synchronously, since now the refreshtime isn't @@ -602,7 +602,7 @@ void NetManager::scan() } else if (pid!=0) { - //tqparent + //parent ::close(fileDescr[1]); m_pipeFD=fileDescr[0]; m_childPid=pid; @@ -617,7 +617,7 @@ void NetManager::scan() doScan(); //in the child we don't have to call setServerServer() //since this opens the listening socket, what has to be done - //in the tqparent process + //in the parent process m_serverServer=1; } else @@ -629,7 +629,7 @@ void NetManager::scan() doScan(); //in the child we don't have to call setServerServer() //since this opens the listening socket, what has to be done - //in the tqparent process + //in the parent process m_serverServer=1; } else @@ -639,7 +639,7 @@ void NetManager::scan() m_serverServer=0; } } - mdcerr<<" NetScanner::scan: sending information to tqparent process"<<std::endl; + mdcerr<<" NetScanner::scan: sending information to parent process"<<std::endl; writeDataToFD(fileDescr[1],m_serverServer); mdcerr<<" NetScanner::scan: closed FD: "<<::close(fileDescr[1])<<std::endl; mdcerr<<" NetScanner::scan: exiting now"<<std::endl; diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp index 5486c506..acf0515c 100644 --- a/lanbrowsing/lisa/netscanner.cpp +++ b/lanbrowsing/lisa/netscanner.cpp @@ -189,15 +189,15 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) { if (tmp.contains('/')) { - //mdcerr<<"net/tqmask combination detected"<<std::endl; + //mdcerr<<"net/mask combination detected"<<std::endl; MyString netStr(tmp.left(tmp.find("/"))); MyString maskStr(tmp.mid(tmp.find("/")+1)); - unsigned int tqmask(IPAddress(maskStr).asInt()); - unsigned int net(IPAddress(netStr).asInt()&tqmask); - if ((~tqmask)<indexLeft) + unsigned int mask(IPAddress(maskStr).asInt()); + unsigned int net(IPAddress(netStr).asInt()&mask); + if ((~mask)<indexLeft) { - indexLeft=indexLeft-(~tqmask+1); - tmpIndex+=(~tqmask)+1; + indexLeft=indexLeft-(~mask+1); + tmpIndex+=(~mask)+1; //mdcerr<<"i: "<<tmpIndex<<" left: "<<indexLeft<<std::endl; } else diff --git a/lanbrowsing/lisa/strictmain.cpp b/lanbrowsing/lisa/strictmain.cpp index 829c8f5d..a948d6df 100644 --- a/lanbrowsing/lisa/strictmain.cpp +++ b/lanbrowsing/lisa/strictmain.cpp @@ -203,11 +203,11 @@ int main(int argc, char** argv) } } - //fork and let the tqparent exit + //fork and let the parent exit pid_t pid=fork(); if (pid>0) { - //this is the tqparent + //this is the parent exit(0); } else if (pid<0) diff --git a/librss/article.cpp b/librss/article.cpp index 8c6e8f91..8c3fa313 100644 --- a/librss/article.cpp +++ b/librss/article.cpp @@ -112,9 +112,9 @@ const TQDateTime &Article::pubDate() const return d->pubDate; } -KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const +KURLLabel *Article::widget(TQWidget *parent, const char *name) const { - KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name); + KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); label->setUseTips(true); if (!d->description.isNull()) label->setTipText(d->description); diff --git a/librss/article.h b/librss/article.h index 0444e7f3..838e2f16 100644 --- a/librss/article.h +++ b/librss/article.h @@ -126,7 +126,7 @@ namespace RSS const TQDateTime &pubDate() const; /** - * @param tqparent The tqparent widget for the KURLLabel. + * @param parent The parent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. * This makes building a user-interface which contains the @@ -139,7 +139,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; private: struct Private; diff --git a/librss/document.cpp b/librss/document.cpp index 1cf9730e..d6059f05 100644 --- a/librss/document.cpp +++ b/librss/document.cpp @@ -109,7 +109,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; - /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent + /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ TQDomNode parentNode; diff --git a/librss/tools_p.cpp b/librss/tools_p.cpp index 01a4f36d..9c75ade4 100644 --- a/librss/tools_p.cpp +++ b/librss/tools_p.cpp @@ -12,9 +12,9 @@ #include <tqdom.h> -TQString RSS::extractNode(const TQDomNode &tqparent, const TQString &elemName) +TQString RSS::extractNode(const TQDomNode &parent, const TQString &elemName) { - TQDomNode node = tqparent.namedItem(elemName); + TQDomNode node = parent.namedItem(elemName); if (node.isNull()) return TQString(); diff --git a/librss/tools_p.h b/librss/tools_p.h index bfa418ce..da67251f 100644 --- a/librss/tools_p.h +++ b/librss/tools_p.h @@ -24,7 +24,7 @@ namespace RSS unsigned int count; }; - TQString extractNode(const TQDomNode &tqparent, const TQString &elemName); + TQString extractNode(const TQDomNode &parent, const TQString &elemName); } #endif // LIBRSS_TOOLS_P_H diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp index 01dee241..ff5d2cf9 100644 --- a/wifi/kcmwifi/ifconfigpage.cpp +++ b/wifi/kcmwifi/ifconfigpage.cpp @@ -37,8 +37,8 @@ #include <unistd.h> #include <sys/types.h> -IfConfigPage::IfConfigPage( int configNum, TQWidget *tqparent, const char *name ) - : IfConfigPageBase( tqparent, name ), +IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name ) + : IfConfigPageBase( parent, name ), m_configNum( configNum ) { connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); diff --git a/wifi/kcmwifi/ifconfigpage.h b/wifi/kcmwifi/ifconfigpage.h index 5e09e46d..abc1d84f 100644 --- a/wifi/kcmwifi/ifconfigpage.h +++ b/wifi/kcmwifi/ifconfigpage.h @@ -29,7 +29,7 @@ class IfConfigPage : public IfConfigPageBase TQ_OBJECT public: - IfConfigPage( int configNum, TQWidget *tqparent, const char *name ); + IfConfigPage( int configNum, TQWidget *parent, const char *name ); ~IfConfigPage() {} void load(); diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 8251afa0..36ca0daf 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -42,8 +42,8 @@ typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory; K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") ) -KCMWifi::KCMWifi(TQWidget * tqparent, const char *name, const TQStringList &) - : KCModule (tqparent, name) +KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) + : KCModule (parent, name) { tabs = new TQTabWidget (this, "tabs"); diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h index ad90a00e..d07d8930 100644 --- a/wifi/kcmwifi/kcmwifi.h +++ b/wifi/kcmwifi/kcmwifi.h @@ -35,7 +35,7 @@ class KCMWifi : public KCModule Q_OBJECT TQ_OBJECT public: - KCMWifi (TQWidget * tqparent, const char *name, const TQStringList &); + KCMWifi (TQWidget * parent, const char *name, const TQStringList &); ~KCMWifi (); void load(); diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index 22a25a34..ca2a666d 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -33,8 +33,8 @@ #include <tqcheckbox.h> #include <tqfile.h> -MainConfig::MainConfig( TQWidget *tqparent, const char *name ) - : MainConfigBase( tqparent, name ) +MainConfig::MainConfig( TQWidget *parent, const char *name ) + : MainConfigBase( parent, name ) { WifiConfig *config = WifiConfig::instance(); diff --git a/wifi/kcmwifi/mainconfig.h b/wifi/kcmwifi/mainconfig.h index d485b524..356b9a12 100644 --- a/wifi/kcmwifi/mainconfig.h +++ b/wifi/kcmwifi/mainconfig.h @@ -31,7 +31,7 @@ class MainConfig : public MainConfigBase TQ_OBJECT public: - MainConfig( TQWidget *tqparent, const char *name=0 ); + MainConfig( TQWidget *parent, const char *name=0 ); ~MainConfig() {} void load(); diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index 0a91605b..c52969ac 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -83,7 +83,7 @@ class KWiFiManagerApp:public KMainWindow, virtual public dcop_interface TQ_OBJECT public: - KWiFiManagerApp (TQWidget * tqparent = 0, const char * name = 0); + KWiFiManagerApp (TQWidget * parent = 0, const char * name = 0); ~KWiFiManagerApp (); TQString interface () const { return device ? device->get_interface_name() : TQString(); }; public: diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp index 6fe1df9b..39b66a76 100644 --- a/wifi/kwireless/kwireless.cpp +++ b/wifi/kwireless/kwireless.cpp @@ -18,8 +18,8 @@ KWireLess::KWireLess(const TQString& configFile, Type type, - int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name) + int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name) { ksConfig = config(); @@ -76,13 +76,13 @@ void KWireLess::resizeEvent(TQResizeEvent *) extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { KGlobal::locale()->insertCatalogue("kwireless"); return new KWireLess(configFile, KPanelApplet::Normal, KPanelApplet::About, // | KPanelApplet::Help | KPanelApplet::Preferences, - tqparent, "kwireless"); + parent, "kwireless"); } } diff --git a/wifi/kwireless/kwireless.h b/wifi/kwireless/kwireless.h index 3d4b7545..eeb41938 100644 --- a/wifi/kwireless/kwireless.h +++ b/wifi/kwireless/kwireless.h @@ -27,7 +27,7 @@ class KWireLess : public KPanelApplet public: KWireLess(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~KWireLess(); virtual int widthForHeight(int height) const; diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 6390a023..86bb6ed7 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -135,8 +135,8 @@ TQString DeviceInfo::encrString() } } -KWireLessWidget::KWireLessWidget(TQWidget *tqparent, const char* name) - : TQWidget(tqparent, name), +KWireLessWidget::KWireLessWidget(TQWidget *parent, const char* name) + : TQWidget(parent, name), mode(Horizontal), frameWidth(1), qualityBarWidth(6), @@ -308,17 +308,17 @@ void KWireLessWidget::paintEvent(TQPaintEvent*) } } -KWireLessWidget* KWireLessWidget::makeWireLessWidget(TQWidget *tqparent, +KWireLessWidget* KWireLessWidget::makeWireLessWidget(TQWidget *parent, const char *name) { #if 1 // defined linuxwirelesswidget - return new LinuxWireLessWidget(tqparent, name); + return new LinuxWireLessWidget(parent, name); #else #error KWireLess is not available for your OS #endif // just to shut the compiler up: - tqparent = tqparent; name = name; return 0; + parent = parent; name = name; return 0; } #include "kwirelesswidget.moc" diff --git a/wifi/kwireless/kwirelesswidget.h b/wifi/kwireless/kwirelesswidget.h index 534c16c4..6999de4e 100644 --- a/wifi/kwireless/kwirelesswidget.h +++ b/wifi/kwireless/kwirelesswidget.h @@ -59,10 +59,10 @@ public: Horizontal, Vertical }; - static KWireLessWidget* makeWireLessWidget(TQWidget *tqparent = 0, + static KWireLessWidget* makeWireLessWidget(TQWidget *parent = 0, const char *name = 0); protected: - KWireLessWidget(TQWidget *tqparent=0, const char* name=0); + KWireLessWidget(TQWidget *parent=0, const char* name=0); public: ~KWireLessWidget(); void setMode(Mode); diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp index b7aa31b4..02b7e217 100644 --- a/wifi/kwireless/linuxwirelesswidget.cpp +++ b/wifi/kwireless/linuxwirelesswidget.cpp @@ -23,8 +23,8 @@ extern "C" { int LinuxWireLessWidget::socketFD; TQStringList LinuxWireLessWidget::deviceNames; -LinuxWireLessWidget::LinuxWireLessWidget(TQWidget *tqparent, const char* name) - : KWireLessWidget(tqparent, name), +LinuxWireLessWidget::LinuxWireLessWidget(TQWidget *parent, const char* name) + : KWireLessWidget(parent, name), m_number (-1) { } diff --git a/wifi/kwireless/linuxwirelesswidget.h b/wifi/kwireless/linuxwirelesswidget.h index 0d4513ca..fb29c665 100644 --- a/wifi/kwireless/linuxwirelesswidget.h +++ b/wifi/kwireless/linuxwirelesswidget.h @@ -17,7 +17,7 @@ class LinuxWireLessWidget : public KWireLessWidget Q_OBJECT TQ_OBJECT public: - LinuxWireLessWidget(TQWidget *tqparent=0, const char* name=0); + LinuxWireLessWidget(TQWidget *parent=0, const char* name=0); ~LinuxWireLessWidget(); protected: /** poll() is supposed to read the information from diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp index 4b0bea14..7c73b1c2 100644 --- a/wifi/kwireless/propertytable.cpp +++ b/wifi/kwireless/propertytable.cpp @@ -21,8 +21,8 @@ extern "C" { #include <math.h> } -PropertyTable::PropertyTable(TQWidget *tqparent, const char* name) - : PropertyTableBase(tqparent, name) +PropertyTable::PropertyTable(TQWidget *parent, const char* name) + : PropertyTableBase(parent, name) { } @@ -30,8 +30,8 @@ PropertyTable::~PropertyTable() { } -PropertiesDialog::PropertiesDialog(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, +PropertiesDialog::PropertiesDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n("Wireless Network Device Properties"), KDialogBase::Ok, KDialogBase::Ok, true), wait(false) diff --git a/wifi/kwireless/propertytable.h b/wifi/kwireless/propertytable.h index f71f9f6b..81169018 100644 --- a/wifi/kwireless/propertytable.h +++ b/wifi/kwireless/propertytable.h @@ -22,7 +22,7 @@ class PropertyTable : public PropertyTableBase Q_OBJECT TQ_OBJECT public: - PropertyTable(TQWidget *tqparent = 0, const char* name = 0); + PropertyTable(TQWidget *parent = 0, const char* name = 0); ~PropertyTable(); }; @@ -32,7 +32,7 @@ class PropertiesDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PropertiesDialog(TQWidget *tqparent = 0, const char *name = 0); + PropertiesDialog(TQWidget *parent = 0, const char *name = 0); protected: PropertyTable *table; TQPtrList<DeviceInfo> *info; diff --git a/wifi/locator.cpp b/wifi/locator.cpp index 859b7d73..6bb0cd62 100644 --- a/wifi/locator.cpp +++ b/wifi/locator.cpp @@ -21,7 +21,7 @@ extern TQStringList APs; -Locator::Locator (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent, +Locator::Locator (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "KwiFiManager") { this->device = device; diff --git a/wifi/locator.h b/wifi/locator.h index 8f0335d4..b1629b19 100644 --- a/wifi/locator.h +++ b/wifi/locator.h @@ -29,7 +29,7 @@ class Interface_wireless; class Locator:public TQWidget { public: - Locator (TQWidget * tqparent, Interface_wireless * device); + Locator (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); void generateLocWidget (); diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index f8cc710a..429cb525 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -32,7 +32,7 @@ #include "networkscanning.h" #include "interface_wireless.h" -NetworkScanning::NetworkScanning (Interface_wireless * dev, TQWidget * tqparent, const char * name ) : TQWidget ( tqparent, name ) { +NetworkScanning::NetworkScanning (Interface_wireless * dev, TQWidget * parent, const char * name ) : TQWidget ( parent, name ) { device = dev; networkScan(); } diff --git a/wifi/networkscanning.h b/wifi/networkscanning.h index 1abfa9b5..a197e217 100644 --- a/wifi/networkscanning.h +++ b/wifi/networkscanning.h @@ -35,7 +35,7 @@ class NetworkScanning : public TQWidget TQ_OBJECT public: - NetworkScanning (Interface_wireless * dev, TQWidget * tqparent = 0, const char * name = 0 ); + NetworkScanning (Interface_wireless * dev, TQWidget * parent = 0, const char * name = 0 ); protected: void networkScan (); diff --git a/wifi/picture.cpp b/wifi/picture.cpp index 4b03686b..5e4d28c5 100644 --- a/wifi/picture.cpp +++ b/wifi/picture.cpp @@ -25,7 +25,7 @@ #define X_OFFSET 20 #define Y_OFFSET 10 -Picture::Picture (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent, +Picture::Picture (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "picture") { this->device = device; diff --git a/wifi/picture.h b/wifi/picture.h index 8ac7f05f..4cd7b4d4 100644 --- a/wifi/picture.h +++ b/wifi/picture.h @@ -24,7 +24,7 @@ class TQSize; class Picture:public TQWidget { public: - Picture (TQWidget * tqparent, Interface_wireless * device); + Picture (TQWidget * parent, Interface_wireless * device); TQSize mySizeHint(); ~Picture (); private: diff --git a/wifi/speed.cpp b/wifi/speed.cpp index c09dbb54..6fdff63d 100644 --- a/wifi/speed.cpp +++ b/wifi/speed.cpp @@ -21,7 +21,7 @@ #include "speed.h" #include "interface_wireless.h" -Speed::Speed (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent, +Speed::Speed (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "KWiFiManager") { this->device = device; diff --git a/wifi/speed.h b/wifi/speed.h index b79526bc..3b47dd14 100644 --- a/wifi/speed.h +++ b/wifi/speed.h @@ -25,7 +25,7 @@ class Interface_wireless; class Speed:public TQWidget { public: - Speed (TQWidget * tqparent, Interface_wireless * device); + Speed (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); Interface_wireless *device; diff --git a/wifi/status.cpp b/wifi/status.cpp index c6072c4f..5f295df5 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -22,8 +22,8 @@ #include <unistd.h> #include <sys/types.h> -tqStatus::tqStatus (TQWidget * tqparent, Interface_wireless * device) - : TQWidget (tqparent, "KWiFiManager status") +tqStatus::tqStatus (TQWidget * parent, Interface_wireless * device) + : TQWidget (parent, "KWiFiManager status") { this->device = device; } diff --git a/wifi/status.h b/wifi/status.h index 3cc6fe75..dfdfd81d 100644 --- a/wifi/status.h +++ b/wifi/status.h @@ -29,7 +29,7 @@ class Interface_wireless; class tqStatus:public TQWidget { public: - tqStatus (TQWidget * tqparent, Interface_wireless * device); + tqStatus (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); bool generateStatsWidget (); diff --git a/wifi/strength.cpp b/wifi/strength.cpp index a5146c14..4ca1dc08 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -27,7 +27,7 @@ extern bool useAlternateStrengthCalc; -Strength::Strength (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent, +Strength::Strength (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "strength") { this->device = device; diff --git a/wifi/strength.h b/wifi/strength.h index e4cdd210..ebac09b7 100644 --- a/wifi/strength.h +++ b/wifi/strength.h @@ -28,7 +28,7 @@ class Strength:public TQWidget TQ_OBJECT public: - Strength (TQWidget * tqparent, Interface_wireless * device); + Strength (TQWidget * parent, Interface_wireless * device); TQSize mySizeHint(); ~Strength (); TQPixmap *NOT_CON_OFFLINE_ADHOC, *OOR_DOWN, *OOR_MINIMUM, *MARGINAL, *GOOD, *EXCELLENT; |