summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete')
-rw-r--r--kopete/libkopete/avdevice/qvideo.cpp4
-rw-r--r--kopete/libkopete/avdevice/qvideostream.cpp8
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectordialog.cpp20
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectordialog.h10
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.cpp4
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.h2
-rw-r--r--kopete/libkopete/connectionmanager.cpp2
-rw-r--r--kopete/libkopete/connectionmanager.h2
-rw-r--r--kopete/libkopete/kabcpersistence.cpp2
-rw-r--r--kopete/libkopete/kabcpersistence.h2
-rw-r--r--kopete/libkopete/kautoconfig.cpp8
-rw-r--r--kopete/libkopete/kautoconfig.h8
-rw-r--r--kopete/libkopete/kcautoconfigmodule.cpp16
-rw-r--r--kopete/libkopete/kcautoconfigmodule.h24
-rw-r--r--kopete/libkopete/knotification.cpp4
-rw-r--r--kopete/libkopete/knotification.h8
-rw-r--r--kopete/libkopete/kopeteaccount.cpp18
-rw-r--r--kopete/libkopete/kopeteaccount.h16
-rw-r--r--kopete/libkopete/kopeteaccountmanager.h2
-rw-r--r--kopete/libkopete/kopeteaway.cpp16
-rw-r--r--kopete/libkopete/kopeteawayaction.cpp8
-rw-r--r--kopete/libkopete/kopeteawayaction.h8
-rw-r--r--kopete/libkopete/kopeteawaydialog.cpp4
-rw-r--r--kopete/libkopete/kopeteawaydialog.h4
-rw-r--r--kopete/libkopete/kopeteblacklister.cpp4
-rw-r--r--kopete/libkopete/kopeteblacklister.h4
-rw-r--r--kopete/libkopete/kopetechatsessionmanager.cpp4
-rw-r--r--kopete/libkopete/kopetechatsessionmanager.h2
-rw-r--r--kopete/libkopete/kopetecommandhandler.cpp24
-rw-r--r--kopete/libkopete/kopetecommandhandler.h18
-rw-r--r--kopete/libkopete/kopetecontact.cpp14
-rw-r--r--kopete/libkopete/kopetecontact.h12
-rw-r--r--kopete/libkopete/kopetecontactlist.cpp2
-rw-r--r--kopete/libkopete/kopetecontactlist.h2
-rw-r--r--kopete/libkopete/kopetecontactlistelement.cpp4
-rw-r--r--kopete/libkopete/kopetecontactlistelement.h2
-rw-r--r--kopete/libkopete/kopetemessageevent.cpp4
-rw-r--r--kopete/libkopete/kopetemessageevent.h2
-rw-r--r--kopete/libkopete/kopetemetacontact.cpp2
-rw-r--r--kopete/libkopete/kopeteonlinestatusmanager.cpp14
-rw-r--r--kopete/libkopete/kopeteonlinestatusmanager.h8
-rw-r--r--kopete/libkopete/kopetepassword.cpp2
-rw-r--r--kopete/libkopete/kopetepasswordedaccount.cpp8
-rw-r--r--kopete/libkopete/kopetepasswordedaccount.h8
-rw-r--r--kopete/libkopete/kopeteplugin.cpp4
-rw-r--r--kopete/libkopete/kopeteplugin.h6
-rw-r--r--kopete/libkopete/kopeteproperties.h8
-rw-r--r--kopete/libkopete/kopeteprotocol.cpp4
-rw-r--r--kopete/libkopete/kopeteprotocol.h12
-rw-r--r--kopete/libkopete/kopetetransfermanager.cpp2
-rw-r--r--kopete/libkopete/kopetetransfermanager.h2
-rw-r--r--kopete/libkopete/kopeteuiglobal.h2
-rw-r--r--kopete/libkopete/managedconnectionaccount.cpp4
-rw-r--r--kopete/libkopete/managedconnectionaccount.h4
-rw-r--r--kopete/libkopete/private/kopetecommand.cpp6
-rw-r--r--kopete/libkopete/private/kopetecommand.h4
-rw-r--r--kopete/libkopete/private/kopeteemoticons.h2
-rw-r--r--kopete/libkopete/tests/mock/kopeteaccount_mock.cpp2
-rw-r--r--kopete/libkopete/tests/mock/kopeteaccount_mock.h2
-rw-r--r--kopete/libkopete/tests/mock/kopetecontact_mock.cpp2
-rw-r--r--kopete/libkopete/tests/mock/kopetecontact_mock.h2
-rw-r--r--kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp6
-rw-r--r--kopete/libkopete/tests/mock/kopeteprotocol_mock.h6
-rw-r--r--kopete/libkopete/ui/accountselector.cpp12
-rw-r--r--kopete/libkopete/ui/accountselector.h8
-rw-r--r--kopete/libkopete/ui/addcontactpage.cpp2
-rw-r--r--kopete/libkopete/ui/addcontactpage.h2
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget.cpp2
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.cpp6
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.h4
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.cpp4
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.h2
-rw-r--r--kopete/libkopete/ui/addresseeitem.cpp4
-rw-r--r--kopete/libkopete/ui/addresseeitem.h4
-rw-r--r--kopete/libkopete/ui/contactaddednotifydialog.h4
-rw-r--r--kopete/libkopete/ui/kopete.widgets4
-rw-r--r--kopete/libkopete/ui/kopetecontactaction.cpp4
-rw-r--r--kopete/libkopete/ui/kopetecontactaction.h2
-rw-r--r--kopete/libkopete/ui/kopetefileconfirmdialog.cpp4
-rw-r--r--kopete/libkopete/ui/kopetefileconfirmdialog.h2
-rw-r--r--kopete/libkopete/ui/kopetelistview.cpp12
-rw-r--r--kopete/libkopete/ui/kopetelistview.h2
-rw-r--r--kopete/libkopete/ui/kopetelistviewitem.cpp72
-rw-r--r--kopete/libkopete/ui/kopetelistviewitem.h38
-rw-r--r--kopete/libkopete/ui/kopetelistviewsearchline.cpp8
-rw-r--r--kopete/libkopete/ui/kopetelistviewsearchline.h4
-rw-r--r--kopete/libkopete/ui/kopetepasswordwidget.cpp4
-rw-r--r--kopete/libkopete/ui/kopetepasswordwidget.h4
-rw-r--r--kopete/libkopete/ui/kopetestdaction.cpp54
-rw-r--r--kopete/libkopete/ui/kopetestdaction.h26
-rw-r--r--kopete/libkopete/ui/kopeteview.h4
-rw-r--r--kopete/libkopete/ui/kopeteviewplugin.cpp4
-rw-r--r--kopete/libkopete/ui/kopeteviewplugin.h2
-rw-r--r--kopete/libkopete/ui/kopetewidgets.cpp10
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.cpp6
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.h4
-rw-r--r--kopete/libkopete/webcamwidget.cpp4
-rw-r--r--kopete/libkopete/webcamwidget.h4
99 files changed, 377 insertions, 377 deletions
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();
/**