diff options
Diffstat (limited to 'kopete/libkopete')
171 files changed, 1952 insertions, 1885 deletions
diff --git a/kopete/libkopete/API-TODO b/kopete/libkopete/API-TODO index ea63082b..4914b00c 100644 --- a/kopete/libkopete/API-TODO +++ b/kopete/libkopete/API-TODO @@ -178,7 +178,7 @@ Richard's proposal: (email questions to the list or to kde@metafoo.co.uk) order) by the object creating the filter chain. it either returns a new filter for the chain, or returns NULL (meaning this filter is not needed in this chain). - - the signals in one filter are connected to the slots in the next. any + - the Q_SIGNALS in one filter are connected to the Q_SLOTS in the next. any sent/received message is handed to the first filter in the appropriate chain. - how long does a filter chain live for? diff --git a/kopete/libkopete/avdevice/kxv.cpp b/kopete/libkopete/avdevice/kxv.cpp index f573bd50..33ea9391 100644 --- a/kopete/libkopete/avdevice/kxv.cpp +++ b/kopete/libkopete/avdevice/kxv.cpp @@ -338,7 +338,7 @@ KXvDevice::KXvDevice() xv_attr = NULL; xv_port = -1; xv_encoding = -1; - xv_name = TQString::null; + xv_name = TQString(); xv_type = -1; xv_adaptor = -1; _shm = false; diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index d8d91602..a85589ab 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 mask = VisualScreenMask; + long tqmask = 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(), mask, &vi_out, &nvis); + vi_in = XGetVisualInfo(qt_xdisplay(), tqmask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { diff --git a/kopete/libkopete/avdevice/qvideo.h b/kopete/libkopete/avdevice/qvideo.h index d49fecbf..5b27f31a 100644 --- a/kopete/libkopete/avdevice/qvideo.h +++ b/kopete/libkopete/avdevice/qvideo.h @@ -24,8 +24,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef QVIDEO_H -#define QVIDEO_H +#ifndef TQVIDEO_H +#define TQVIDEO_H class QVideo { @@ -64,5 +64,5 @@ public: static bool findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel); }; -#endif //QVIDEO_H +#endif //TQVIDEO_H diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 05bbf209..7f4c677d 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -40,10 +40,10 @@ extern "C" { #endif #ifdef HAVE_GL -class QVideoStreamGLWidget : public QGLWidget +class QVideoStreamGLWidget : public TQGLWidget { public: - QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0); + QVideoStreamGLWidget(TQWidget* tqparent = 0, const char* name = 0); virtual ~QVideoStreamGLWidget(); void setInputSize(const TQSize& sz); @@ -213,7 +213,7 @@ void QVideoStream::init() d->shmh.shmaddr = (char *)shmat(d->shmh.shmid, 0, 0); d->xim->data = (char*)d->shmh.shmaddr; d->shmh.readOnly = False; - Status s = XShmAttach(_w->x11Display(), &(d->shmh)); + tqStatus s = XShmAttach(_w->x11Display(), &(d->shmh)); if (s) { XSync(_w->x11Display(), False); shmctl(d->shmh.shmid, IPC_RMID, 0); @@ -235,7 +235,7 @@ void QVideoStream::init() } d->xim = XCreateImage(_w->x11Display(), - (Visual*)_w->x11Visual(), + (Visual*)TQT_TQPAINTDEVICE(_w)->x11Visual(), _w->x11Depth(), ZPixmap, 0, 0, _inputSize.width(), @@ -532,10 +532,10 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img) // --------------------------------------------------------------------------------------- #ifdef HAVE_GL -QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) - : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name), +QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* tqparent, const char* name) + : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), tqparent, name), _tex(0), - _w(parent), + _w(tqparent), _glfun(false) { kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl; @@ -543,7 +543,7 @@ QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) connect(_w, TQT_SIGNAL(resized(int, int)), this, TQT_SLOT(resize(int, int))); - topLevelWidget()->installEventFilter(this); + tqtopLevelWidget()->installEventFilter(this); _glfunTimer = new TQTimer(); } @@ -563,10 +563,10 @@ bool QVideoStreamGLWidget::eventFilter(TQObject*, TQEvent* e) // For some reason, KeyPress does not work (yields 2), TQEvent::KeyPress is unknown... What the f...???? // I am too lazy to scan the header files for the reason. if(e->type() == 6) { - TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); - if(ke->key() == Qt::Key_Pause) { + TQKeyEvent* ke = TQT_TQKEYEVENT(e); + if(ke->key() == TQt::Key_Pause) { _glfunTimer->start(500, true); - } else if (_glfunTimer->isActive() && (ke->key() == Qt::Key_Escape)) { + } else if (_glfunTimer->isActive() && (ke->key() == TQt::Key_Escape)) { _glfun = !_glfun; } } @@ -594,7 +594,7 @@ void QVideoStreamGLWidget::initializeGL() kdDebug() << " Plane: " << f.plane() << endl; kdDebug() << " MAX_TEXTURE_SIZE: " << _maxGL << endl; - qglClearColor(Qt::black); + qglClearColor(TQt::black); glShadeModel(GL_FLAT); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); diff --git a/kopete/libkopete/avdevice/qvideostream.h b/kopete/libkopete/avdevice/qvideostream.h index 24b7fb40..90df7131 100644 --- a/kopete/libkopete/avdevice/qvideostream.h +++ b/kopete/libkopete/avdevice/qvideostream.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef _QVIDEOSTREAM_H -#define _QVIDEOSTREAM_H +#ifndef _TQVIDEOSTREAM_H +#define _TQVIDEOSTREAM_H #ifdef HAVE_CONFIG_H #include <config.h> @@ -44,6 +44,7 @@ class QVideoStreamPrivate; class QVideoStream : public TQObject, public QVideo { Q_OBJECT + TQ_OBJECT public: QVideoStream(TQWidget *widget, const char* name = 0); diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp index 00ab8266..ea235441 100644 --- a/kopete/libkopete/avdevice/videodevice.cpp +++ b/kopete/libkopete/avdevice/videodevice.cpp @@ -71,7 +71,7 @@ void VideoDevice::enumerateMenu (void) { if (0 == xioctl (VIDIOC_QUERYMENU, &querymenu)) { - kdDebug(14010) << k_funcinfo << " " << TQString::fromLocal8Bit((const char*)querymenu.name) << endl; + kdDebug(14010) << k_funcinfo << " " << TQString(TQString::fromLocal8Bit((const char*)querymenu.name)) << endl; } else { @@ -301,7 +301,7 @@ for (currentid = V4L2_CID_BASE; currentid < V4L2_CID_LASTP1; currentid++) continue; //kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << endl; -kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; +kdDebug(14010) << k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; /* switch (queryctrl.type) { @@ -332,7 +332,7 @@ for (currentid = V4L2_CID_PRIVATE_BASE;; currentid++) if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) continue; -kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; +kdDebug(14010) << k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; if (queryctrl.type == V4L2_CTRL_TYPE_MENU) enumerateMenu (); @@ -1336,7 +1336,7 @@ int VideoDevice::getImage(TQImage *qimage) if (b<0) b=0; if (b>255) b=255; uint *p = (uint*)qimage->scanLine(y)+x; - *p = qRgba(r,g,b,255); + *p = tqRgba(r,g,b,255); } // Jump to next line diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index 39f6a7c7..1107a54d 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -414,7 +414,7 @@ int VideoDevicePool::getFrame() } /*! - \fn VideoDevicePool::getQImage(TQImage *qimage) + \fn VideoDevicePool::getTQImage(TQImage *qimage) */ int VideoDevicePool::getImage(TQImage *qimage) { @@ -623,7 +623,7 @@ int VideoDevicePool::scanDevices() videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; - const QFileInfoList *list = videodevice_dir.entryInfoList(); + const TQFileInfoList *list = videodevice_dir.entryInfoList(); if (!list) { @@ -639,7 +639,7 @@ int VideoDevicePool::scanDevices() videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; - const QFileInfoList *list = videodevice_dir.entryInfoList(); + const TQFileInfoList *list = videodevice_dir.entryInfoList(); if (!list) { @@ -647,7 +647,7 @@ int VideoDevicePool::scanDevices() return EXIT_FAILURE; } - QFileInfoListIterator fileiterator ( *list ); + TQFileInfoListIterator fileiterator ( *list ); TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; @@ -655,7 +655,7 @@ int VideoDevicePool::scanDevices() { videodevice.setFileName(fileinfo->absFilePath()); kdDebug(14010) << k_funcinfo << "Found device " << videodevice.full_filename << endl; - videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile + videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile if(videodevice.isOpen()) { kdDebug(14010) << k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl; @@ -675,7 +675,7 @@ int VideoDevicePool::scanDevices() return EXIT_SUCCESS; } - QFileInfoListIterator fileiterator ( *list ); + TQFileInfoListIterator fileiterator ( *list ); TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; @@ -683,7 +683,7 @@ int VideoDevicePool::scanDevices() { videodevice.setFileName(fileinfo->absFilePath()); kdDebug(14010) << k_funcinfo << "Found device " << videodevice.full_filename << endl; - videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile + videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile if(videodevice.isOpen()) { kdDebug(14010) << k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl; @@ -760,7 +760,7 @@ void VideoDevicePool::loadConfig() { KConfig *config = KGlobal::config(); config->setGroup("Video Device Settings"); - const TQString currentdevice = config->readEntry("Current Device", TQString::null); + const TQString currentdevice = config->readEntry("Current Device", TQString()); kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl; // m_current_device = 0; // Must check this thing because of the fact that multiple loadConfig in other methodas can do bad things. Watch out! @@ -833,7 +833,7 @@ void VideoDevicePool::saveConfig() } */ // Stores what is the current video device in use - const TQString currentdevice = TQString::fromLocal8Bit ( "Model %1 Device %2" ) .arg(m_videodevice[m_current_device].m_model) .arg(m_videodevice[m_current_device].m_modelindex); + const TQString currentdevice = TQString(TQString::fromLocal8Bit ( "Model %1 Device %2" )) .tqarg(m_videodevice[m_current_device].m_model) .tqarg(m_videodevice[m_current_device].m_modelindex); config->writeEntry( "Current Device", currentdevice); VideoDeviceVector::iterator vditerator; diff --git a/kopete/libkopete/clientiface.h b/kopete/libkopete/clientiface.h index 6a7229b7..ef1ac3f1 100644 --- a/kopete/libkopete/clientiface.h +++ b/kopete/libkopete/clientiface.h @@ -14,14 +14,14 @@ k_dcop: /** * Get the status of the connection to the given host. * @param host - * @return a NetworkStatus::EnumStatus representing the state of the connection to the given host + * @return a NetworktqStatus::EnumtqStatus representing the state of the connection to the given host */ - virtual int status( const TQString & host = TQString::null ) = 0; + virtual int status( const TQString & host = TQString() ) = 0; /** * Request a connection to the named host, registering the application's usage of this connection * @param host The hostname the client wants to connect to. * @param userInitiated Indicates whether the connection is a direct result of a user action or is a background task. Used by the daemon to decide whether to create an on-demand connection. - * @return An NetworkStatus::EnumRequestResult indicating whether the request was accepted + * @return An NetworktqStatus::EnumRequestResult indicating whether the request was accepted */ virtual int request( const TQString & host, bool userInitiated ) = 0; /** diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp index c394af0f..b17da677 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 *parent, - const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) +KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent, + const char *name, bool modal ) : KDialogBase(tqparent, 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 *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); 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 *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); 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 *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); 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 *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.h b/kopete/libkopete/compat/kpixmapregionselectordialog.h index ffc5551e..fbf2db6a 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 *parent=0L, const char *name=0L, + KPixmapRegionSelectorDialog(TQWidget *tqparent=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 *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 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 *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 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 *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 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 *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); protected: KPixmapRegionSelectorWidget *m_pixmapSelectorWidget; diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index ada867bb..0468acdf 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 *parent, - const char *name) : TQWidget( parent, name) +KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent, + const char *name) : TQWidget( tqparent, name) { TQHBoxLayout * hboxLayout=new TQHBoxLayout( this ); @@ -47,7 +47,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, vboxLayout->addStretch(); m_label = new TQLabel(this, "pixmapHolder"); - m_label->setBackgroundMode( Qt::NoBackground ); + m_label->setBackgroundMode( TQt::NoBackground ); m_label->installEventFilter( this ); vboxLayout->addWidget(m_label); @@ -108,9 +108,9 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_linedPixmap = m_originalPixmap; painter.begin(&m_linedPixmap); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), - TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); + TQBrush( TQColor(255,255,255), TQt::BDiagPattern) ); painter.end(); TQImage image=m_linedPixmap.convertToImage(); @@ -125,7 +125,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_originalPixmap, m_selectedRegion ); painter.setPen( TQColor(255,255,255) ); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.drawRect( m_selectedRegion ); @@ -211,7 +211,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; + //kdDebug() << TQString("click at %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; if ( mev->button() == RightButton ) { @@ -223,16 +223,16 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQCursor cursor; - if ( m_selectedRegion.contains( mev->pos() ) + if ( m_selectedRegion.tqcontains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; - cursor.setShape( Qt::SizeAllCursor ); + cursor.setShape( TQt::SizeAllCursor ); } else { m_state=Resizing; - cursor.setShape( Qt::CrossCursor ); + cursor.setShape( TQt::CrossCursor ); } TQApplication::setOverrideCursor(cursor); @@ -246,7 +246,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("move to %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; + //kdDebug() << TQString("move to %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; if ( m_state == Resizing ) { @@ -418,7 +418,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect(); // kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl; -// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl; +// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl; if ( !m_originalPixmap.isNull() && ( m_originalPixmap.width() > m_maxWidth || @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h index 6b0a319b..036b232a 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h @@ -41,14 +41,15 @@ class KPopupMenu; * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KOPETE_EXPORT KPixmapRegionSelectorWidget : public QWidget +class KOPETE_EXPORT KPixmapRegionSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor for a KPixmapRegionSelectorWidget. */ - KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L); + KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L); /** * Destructor for a KPixmapRegionSelectorWidget diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp index dcfa0ee1..b2e547fa 100644 --- a/kopete/libkopete/connectionmanager.cpp +++ b/kopete/libkopete/connectionmanager.cpp @@ -20,7 +20,7 @@ class ConnectionManagerPrivate }; // Connection manager itself -ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( parent, name ) +ConnectionManager::ConnectionManager( TQObject * tqparent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( tqparent, name ) { d = new ConnectionManagerPrivate; @@ -45,19 +45,19 @@ void ConnectionManager::initialise() { // determine initial state and set the state object accordingly. d->m_state = Inactive; - updateStatus(); + updatetqStatus(); } -void ConnectionManager::updateStatus() +void ConnectionManager::updatetqStatus() { - NetworkStatus::EnumStatus daemonStatus = (NetworkStatus::EnumStatus)d->m_stub->status( TQString::null ); + NetworktqStatus::EnumtqStatus daemontqStatus = (NetworktqStatus::EnumtqStatus)d->m_stub->status( TQString() ); kdDebug() << k_funcinfo << endl; - switch ( daemonStatus ) + switch ( daemontqStatus ) { - case NetworkStatus::Offline: - case NetworkStatus::OfflineFailed: - case NetworkStatus::OfflineDisconnected: - case NetworkStatus::ShuttingDown: + case NetworktqStatus::Offline: + case NetworktqStatus::OfflineFailed: + case NetworktqStatus::OfflineDisconnected: + case NetworktqStatus::ShuttingDown: if ( d->m_state == Online ) { kdDebug() << "STATE IS PENDING" << endl; @@ -69,13 +69,13 @@ void ConnectionManager::updateStatus() d->m_state = Offline; } break; - case NetworkStatus::Establishing: - case NetworkStatus::Online: + case NetworktqStatus::Establishing: + case NetworktqStatus::Online: kdDebug() << "STATE IS ONLINE" << endl; d->m_state = Online; break; - case NetworkStatus::NoNetworks: - case NetworkStatus::Unreachable: + case NetworktqStatus::NoNetworks: + case NetworktqStatus::Unreachable: kdDebug() << "STATE IS INACTIVE" << endl; d->m_state = Inactive; break; @@ -87,38 +87,38 @@ ConnectionManager::~ConnectionManager() delete d; } -NetworkStatus::EnumStatus ConnectionManager::status( const TQString & host ) +NetworktqStatus::EnumtqStatus ConnectionManager::status( const TQString & host ) { // need also to check that the daemon hasn't died - updateStatus(); + updatetqStatus(); if ( d->m_state == Pending ) - return NetworkStatus::Offline; + return NetworktqStatus::Offline; if ( d->m_state == Online ) - return NetworkStatus::Online; + return NetworktqStatus::Online; if ( d->m_state == Offline ) - return NetworkStatus::Offline; - return NetworkStatus::NoNetworks; + return NetworktqStatus::Offline; + return NetworktqStatus::NoNetworks; } -NetworkStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) +NetworktqStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) { kdDebug() << k_funcinfo << endl; - NetworkStatus::EnumRequestResult result; + NetworktqStatus::EnumRequestResult result; // if offline and the user has previously indicated they didn't want any new connections, suppress it if ( d->m_state == Offline && !userInitiated && d->m_userInitiatedOnly ) - result = NetworkStatus::UserRefused; + result = NetworktqStatus::UserRefused; // if offline, ask the user whether this connection should be allowed if ( d->m_state == Offline ) { if ( askToConnect( mainWidget ) ) - //result = NetworkStatus::Connected; - result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + //result = NetworktqStatus::Connected; + result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); else - result = NetworkStatus::UserRefused; + result = NetworktqStatus::UserRefused; } // otherwise, just ask for the connection else - result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); return result; } @@ -131,12 +131,12 @@ void ConnectionManager::relinquishConnection( const TQString & host ) void ConnectionManager::slotStatusChanged( TQString host, int status ) { kdDebug() << k_funcinfo << endl; - updateStatus(); + updatetqStatus(); // reset user initiated only flag if we are now online if ( d->m_state == Online ) d->m_userInitiatedOnly = false; - emit statusChanged( host, (NetworkStatus::EnumStatus)status ); + emit statusChanged( host, (NetworktqStatus::EnumtqStatus)status ); } bool ConnectionManager::askToConnect( TQWidget * mainWidget ) @@ -147,7 +147,7 @@ bool ConnectionManager::askToConnect( TQWidget * mainWidget ) i18n("This application is currently in offline mode. Do you want to connect in order to carry out this operation?"), i18n("Leave Offline Mode?"), i18n("Connect"), i18n("Stay Offline"), - TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); + TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); } #include "connectionmanager.moc" diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h index 63217183..b0f1c05b 100644 --- a/kopete/libkopete/connectionmanager.h +++ b/kopete/libkopete/connectionmanager.h @@ -26,30 +26,31 @@ class ConnectionManagerPrivate; class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: static ConnectionManager* self(); enum State { Inactive, Online, Offline, Pending }; virtual ~ConnectionManager(); - NetworkStatus::EnumStatus status( const TQString & host ); + NetworktqStatus::EnumtqStatus status( const TQString & host ); // check if a hostname is available. Ask user if offline. Request host - NetworkStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); + NetworktqStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); // method to relinquish a connection void relinquishConnection( const TQString & host ); signals: // signal that the network for a hostname is up/down - void statusChanged( const TQString & host, NetworkStatus::EnumStatus status ); + void statusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); protected: // sets up internal state void initialise(); // reread the desktop status from the daemon and update internal state - void updateStatus(); + void updatetqStatus(); // ask if the user would like to reconnect bool askToConnect( TQWidget * mainWidget ); k_dcop: void slotStatusChanged( TQString host, int status ); private: - ConnectionManager( TQObject *parent, const char * name ); + ConnectionManager( TQObject *tqparent, const char * name ); ConnectionManagerPrivate *d; static ConnectionManager * s_self; }; diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index 93d55b35..f1acaea1 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -45,7 +45,7 @@ namespace Kopete { /** - * utility function to merge two QStrings containing individual elements separated by 0xE000 + * utility function to merge two TQStrings containing individual elements separated by 0xE000 */ static TQString unionContents( TQString arg1, TQString arg2 ) { @@ -53,13 +53,13 @@ static TQString unionContents( TQString arg1, TQString arg2 ) TQStringList outList = TQStringList::split( separator, arg1 ); TQStringList arg2List = TQStringList::split( separator, arg2 ); for ( TQStringList::iterator it = arg2List.begin(); it != arg2List.end(); ++it ) - if ( !outList.contains( *it ) ) + if ( !outList.tqcontains( *it ) ) outList.append( *it ); TQString out = outList.join( separator ); return out; } -KABCPersistence::KABCPersistence( TQObject * parent, const char * name ) : TQObject( parent, name ) +KABCPersistence::KABCPersistence( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ) { s_pendingResources.setAutoDelete( false ); } @@ -128,13 +128,13 @@ void KABCPersistence::write( MetaContact * mc ) for ( ; it != addressMap.end(); ++it ) { // read existing data for this key - TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); + TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); // merge without duplicating TQString toWrite = unionContents( currentCustomForProtocol, it.data().join( TQChar( 0xE000 ) ) ); // Note if nothing ends up in the KABC data, this is because insertCustom does nothing if any param is empty. kdDebug( 14010 ) << k_funcinfo << "Writing: " << it.key() << ", " << "All" << ", " << toWrite << endl; - theAddressee.insertCustom( it.key(), TQString::fromLatin1( "All" ), toWrite ); - TQString check = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); + theAddressee.insertCustom( it.key(), TQString::tqfromLatin1( "All" ), toWrite ); + TQString check = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); } ab->insertAddressee( theAddressee ); //kdDebug( 14010 ) << k_funcinfo << "dumping addressbook before write " << endl; @@ -173,7 +173,7 @@ void KABCPersistence::write( MetaContact * mc ) void KABCPersistence::writeAddressBook( const KABC::Resource * res) { - if ( !s_pendingResources.containsRef( res ) ) + if ( !s_pendingResources.tqcontainsRef( res ) ) s_pendingResources.append( res ); if ( !s_addrBookWritePending ) { @@ -229,7 +229,7 @@ void KABCPersistence::removeKABC( MetaContact *) { // remove the link //kdDebug( 14010 ) << k_funcinfo << "...not found." << endl; - d->metaContactId=TQString::null; + d->metaContactId=TQString(); } else { @@ -274,24 +274,24 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) splitField( *it, app, name, value ); kdDebug( 14010 ) << "app=" << app << " name=" << name << " value=" << value << endl; - if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) + if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - if ( name == TQString::fromLatin1( "All" ) ) + if ( name == TQString::tqfromLatin1( "All" ) ) { kdDebug( 14010 ) << " syncing \"" << app << ":" << name << " with contactlist " << endl; // Get the protocol name from the custom field // by chopping the 'messaging/' prefix from the custom field app name TQString protocolName = app.right( app.length() - 10 ); // munge Jabber hack - if ( protocolName == TQString::fromLatin1( "xmpp" ) ) - protocolName = TQString::fromLatin1( "jabber" ); + if ( protocolName == TQString::tqfromLatin1( "xmpp" ) ) + protocolName = TQString::tqfromLatin1( "jabber" ); // Check Kopete supports it - Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::fromLatin1( "kopete_" ) + protocolName ) ); + Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::tqfromLatin1( "kopete_" ) + protocolName ) ); if ( !proto ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>\"%1\" is not supported by Kopete.</qt>" ).arg( protocolName ), + i18n( "<qt>\"%1\" is not supported by Kopete.</qt>" ).tqarg( protocolName ), i18n( "Could Not Sync with KDE Address Book" ) ); continue; } @@ -305,7 +305,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // Is it in the contact list? // First discard anything after an 0xE120, this is used by IRC to separate nick and server group name, but // IRC doesn't support this properly yet, so the user will have to select an appropriate account manually - int separatorPos = (*it).find( TQChar( 0xE120 ) ); + int separatorPos = (*it).tqfind( TQChar( 0xE120 ) ); if ( separatorPos != -1 ) *it = (*it).left( separatorPos ); @@ -332,14 +332,14 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) } kdDebug( 14010 ) << *it << " already exists in OTHER metacontact, move here?" << endl; // find the Kopete::Contact and attempt to move it to this metacontact. - otherMc->findContact( proto->pluginId(), TQString::null, *it )->setMetaContact( mc ); + otherMc->findContact( proto->pluginId(), TQString(), *it )->setMetaContact( mc ); } else { // if not, prompt to add it kdDebug( 14010 ) << proto->pluginId() << "://" << *it << " was not found in the contact list. Prompting to add..." << endl; if ( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), - i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).arg( proto->displayName() ).arg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) ) + i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::tqfromLatin1( "ImportFromKABC" ) ) ) { // Check the accounts for this protocol are all connected // Most protocols do not allow you to add contacts while offline @@ -353,7 +353,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) if ( !allAccountsConnected ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again.</qt>" ).arg( protocolName ), + i18n( "<qt>One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again.</qt>" ).tqarg( protocolName ), i18n( "Not Connected" ) ); continue; } @@ -378,7 +378,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) else if ( accounts.isEmpty() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>You do not have an account configured for <b>%1</b> yet. Please create an account, connect it, and try again.</qt>" ).arg( protocolName ), + i18n( "<qt>You do not have an account configured for <b>%1</b> yet. Please create an account, connect it, and try again.</qt>" ).tqarg( protocolName ), i18n( "No Account Found" ) ); continue; } @@ -420,12 +420,12 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // FIXME: Remove when IM address API is in KABC (KDE 4) void KABCPersistence::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.find( ':' ); + int colon = str.tqfind( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.find( '-' ); + int dash = tmp.tqfind( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/kabcpersistence.h index f827270f..c6224627 100644 --- a/kopete/libkopete/kabcpersistence.h +++ b/kopete/libkopete/kabcpersistence.h @@ -39,9 +39,10 @@ namespace Kopete class MetaContact; -class KOPETE_EXPORT KABCPersistence : public QObject +class KOPETE_EXPORT KABCPersistence : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * \brief Retrieve the instance of AccountManager. @@ -54,7 +55,7 @@ class KOPETE_EXPORT KABCPersistence : public QObject */ static KABCPersistence* self(); - KABCPersistence( TQObject * parent = 0, const char * name = 0 ); + KABCPersistence( TQObject * tqparent = 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 d54e3123..fd7bb7a8 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -86,11 +86,11 @@ public: TQAsciiDict<int> ignoreTheseWidgets; void init(){ - ignoreTheseWidgets.insert("TQLabel", new int(1)); - ignoreTheseWidgets.insert("TQFrame", new int(2)); - ignoreTheseWidgets.insert("TQGroupBox", new int(3)); - ignoreTheseWidgets.insert("TQButtonGroup", new int(4)); - ignoreTheseWidgets.insert("TQWidget", new int(5)); + ignoreTheseWidgets.insert(TQLABEL_OBJECT_NAME_STRING, new int(1)); + ignoreTheseWidgets.insert(TQFRAME_OBJECT_NAME_STRING, new int(2)); + ignoreTheseWidgets.insert(TQGROUPBOX_OBJECT_NAME_STRING, new int(3)); + ignoreTheseWidgets.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, new int(4)); + ignoreTheseWidgets.insert(TQWIDGET_OBJECT_NAME_STRING, new int(5)); ignoreTheseWidgets.setAutoDelete(true); static bool defaultKDEPropertyMapInstalled = false; @@ -101,13 +101,13 @@ public: } }; -KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, - const char *name) : TQObject(parent, name), config(kconfig) { +KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *tqparent, + const char *name) : TQObject(tqparent, name), config(kconfig) { d = new KAutoConfigPrivate(); } -KAutoConfig::KAutoConfig(TQObject *parent, const char *name) : - TQObject(parent, name), config(KGlobal::config()) { +KAutoConfig::KAutoConfig(TQObject *tqparent, const char *name) : + TQObject(tqparent, name), config(KGlobal::config()) { d = new KAutoConfigPrivate(); } @@ -141,49 +141,49 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ if(trackChanges){ // QT - changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert(TQString::tqfromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("QDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQString::fromLatin1("QDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("QTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert(TQString::tqfromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert(TQString::tqfromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int))); + changedMap.insert(TQString::tqfromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert(TQString::tqfromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::tqfromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::tqfromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged())); + changedMap.insert(TQString::tqfromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); - - changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed())); - changedMap.insert( TQString::fromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert( TQString::fromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( TQString::fromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); + changedMap.insert( TQString::tqfromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::tqfromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::tqfromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::tqfromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::tqfromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); + + changedMap.insert( TQString::tqfromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); + changedMap.insert( TQString::tqfromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); + changedMap.insert( TQString::tqfromLatin1("KEditListBox"), TQT_SIGNAL(changed())); + changedMap.insert( TQString::tqfromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); + changedMap.insert( TQString::tqfromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); + changedMap.insert( TQString::tqfromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( TQString::tqfromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::tqfromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::tqfromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); } - // Go through all of the children of the widgets and find all known widgets + // Go through all of the tqchildren of the widgets and find all known widgets TQPtrListIterator<TQWidget> it( d->widgets ); TQWidget *widget; bool usingDefaultValues = false; @@ -215,8 +215,8 @@ bool KAutoConfig::saveSettings() { TQVariant defaultValue = d->defaultValues[groupWidget]; TQVariant currentValue = propertyMap->property(groupWidget); #if KDE_IS_VERSION( 3, 1, 90 ) - if(!config->hasDefault(TQString::fromLatin1(groupWidget->name())) && currentValue == defaultValue){ - config->revertToDefault(TQString::fromLatin1(groupWidget->name())); + if(!config->hasDefault(TQString::tqfromLatin1(groupWidget->name())) && currentValue == defaultValue){ + config->revertToDefault(TQString::tqfromLatin1(groupWidget->name())); widgetChanged = true; } else{ @@ -353,12 +353,12 @@ void KAutoConfig::reloadSettings() const { bool KAutoConfig::parseChildren(const TQWidget *widget, TQPtrList<TQWidget>& currentGroup, bool trackChanges){ bool valueChanged = false; - const TQPtrList<TQObject> *listOfChildren = widget->children(); - if(!listOfChildren) + const TQObjectList listOfChildren = widget->childrenListObject(); + if(listOfChildren.isEmpty()) return valueChanged; TQSqlPropertyMap *propertyMap = TQSqlPropertyMap::defaultMap(); - TQPtrListIterator<TQObject> it( *listOfChildren ); + TQPtrListIterator<TQObject> it( listOfChildren ); TQObject *object; while ( (object = it.current()) != 0 ) { @@ -367,7 +367,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, continue; } TQWidget *childWidget = (TQWidget *)object; - if(d->ignore.containsRef(childWidget)){ + if(d->ignore.tqcontainsRef(childWidget)){ continue; } @@ -390,7 +390,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, { parseTheChildren = false; // Disable the widget if it is immutable? - if(config->entryIsImmutable( TQString::fromLatin1(childWidget->name()))) + if(config->entryIsImmutable( TQString::tqfromLatin1(childWidget->name()))) childWidget->setEnabled(false); else { @@ -408,15 +408,15 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, propertyMap->setProperty(childWidget, setting); valueChanged = true; } - if(trackChanges && changedMap.find(TQString::fromLatin1(childWidget->className())) != + if(trackChanges && changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) != changedMap.end()) { - connect(childWidget, changedMap[TQString::fromLatin1(childWidget->className())], + connect(childWidget, changedMap[TQString::tqfromLatin1(childWidget->className())], this, TQT_SIGNAL(widgetModified())); } #ifndef NDEBUG else if(trackChanges && - changedMap.find(TQString::fromLatin1(childWidget->className())) == changedMap.end()) + changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) { // Without a signal kautoconfigdialog could incorectly // enable/disable the buttons @@ -439,7 +439,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, if(parseTheChildren) { // this widget is not known as something we can store. - // Maybe we can store one of its children. + // Maybe we can store one of its tqchildren. valueChanged |= parseChildren(childWidget, currentGroup, trackChanges); } } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index 3b10a4d0..c63fcd25 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -55,17 +55,17 @@ class TQWidget; * * KAutoConfig uses the TQSqlPropertyMap class to determine if it can do * anything to a widget. Note that KAutoConfig doesn't require a database, - * it simply uses the functionality that is built into the QSqlPropertyMap + * it simply uses the functionality that is built into the TQSqlPropertyMap * class. New widgets can be added to the map using * TQSqlPropertyMap::installDefaultMap(). Note that you can't just add any - * class. The class must have a matching Q_PROPERTY(...) macro defined. + * class. The class must have a matching TQ_PROPERTY(...) macro defined. * * For example (note that KColorButton is already added and it doesn't need to * manually added): * * kcolorbutton.h defines the following property: * \code - * Q_PROPERTY( TQColor color READ color WRITE setColor ) + * TQ_PROPERTY( TQColor color READ color WRITE setColor ) * \endcode * * To add KColorButton the following code would be inserted in the main. @@ -88,6 +88,7 @@ class TQWidget; class KOPETE_EXPORT KAutoConfig : public TQObject { Q_OBJECT + TQ_OBJECT signals: /** @@ -120,19 +121,19 @@ public: * Constructor. * @param kconfig - KConfig to use when retrieving/saving the widgets * that KAutoConfig knows about. - * @param parent - Parent object. + * @param tqparent - Parent object. * @param name - Object name. */ - KAutoConfig( KConfig *kconfig, TQObject *parent=0, const char *name=0 ); + KAutoConfig( KConfig *kconfig, TQObject *tqparent=0, const char *name=0 ); /** * Constructor. * Uses KGlobal::config() when retrieving/saving the widgets that * KAutoConfig knows about. - * @param parent - Parent object. + * @param tqparent - Parent object. * @param name - Object name. */ - KAutoConfig( TQObject *parent=0, const char *name=0 ); + KAutoConfig( TQObject *tqparent=0, const char *name=0 ); /** * Destructor. Deletes private class. @@ -141,7 +142,7 @@ public: /** * Adds a widget to the list of widgets that should be parsed for any - * children that KAutoConfig might know when retrieveSettings() is + * tqchildren that KAutoConfig might know when retrieveSettings() is * called. All calls to this function should be made before calling * retrieveSettings(). * @param widget - Pointer to the widget to add. @@ -154,7 +155,7 @@ public: /** * Ignore the specified child widget when performing an action. Doesn't - * effect widgets that were added with addWidget() only their children. All + * effect widgets that were added with addWidget() only their tqchildren. All * calls to this function should be made before calling retrieveSettings(). * @param widget - Pointer to the widget that should be ignored. * Note: Widgets that don't have a name are ignored automatically. @@ -185,7 +186,7 @@ public: * * Example: * \code - * addWidgetChangedSignal( "QCheckbox", TQT_SIGNAL(stateChanged(int)) ); + * addWidgetChangedSignal( "TQCheckbox", TQT_SIGNAL(stateChanged(int)) ); * \endcode * * This is generally used in conjunction with the addition of a class @@ -251,13 +252,13 @@ protected: TQMap<TQString, TQCString> changedMap; /** - * Recursive function that finds all known children. - * Goes through the children of widget and if any are known and not being + * Recursive function that finds all known tqchildren. + * Goes through the tqchildren of widget and if any are known and not being * ignored, stores them in currentGroup. Also checks if the widget * should be disabled because it is set immutable. - * @param widget - Parent of the children to look at. - * @param currentGroup - Place to store known children of widget. - * @param trackChanges - If true then tracks any changes to the children of + * @param widget - Parent of the tqchildren to look at. + * @param currentGroup - Place to store known tqchildren of widget. + * @param trackChanges - If true then tracks any changes to the tqchildren of * widget that are known. * @return bool - If a widget was set to something other then its default. * @see retrieveSettings() diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index 122a3e7b..c15b992f 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -30,39 +30,39 @@ class KCAutoConfigModule::KCAutoConfigModulePrivate }; -KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) +KCAutoConfigModule::KCAutoConfigModule( TQWidget * tqparent, const char * name, const TQStringList & args ) + : KCModule( tqparent, name, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( this ); + d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) +KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * tqparent, const TQStringList & args ) + : KCModule( instance, tqparent, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( this ); + d->kautoconfig = new KAutoConfig( 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,TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * tqparent, const char * name, const TQStringList & args ) + : KCModule( tqparent, name, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( config, this ); + 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 * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * tqparent, const TQStringList & args ) + : KCModule( instance, tqparent, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( config, this ); + 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())); } diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index fcca6047..d09173ea 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -33,14 +33,14 @@ class KConfig; * * This class makes it very easy to create a configuration page using KAutoConfig. * All you need to do is create a class that is derived from KCAutoConfigModule, create your - * config page with QDesigner, and add it to the module + * config page with TQDesigner, and add it to the module * This can be done using the setMainWidget() method: * \code * typedef KGenericFactory<MyPageConfig, TQWidget> MyPageConfigFactory; * K_EXPORT_COMPONENT_FACTORY( kcm_mypageconfig, MyPageConfigFactory( "kcm_mypageconfig" ) ) * - * MyPageConfig( TQWidget * parent, const char *, const TQStringList & args ) - * : KCAutoConfigModule( MyPageConfigFactory::instance(), parent, args ) + * MyPageConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + * : KCAutoConfigModule( MyPageConfigFactory::instance(), tqparent, args ) * { * setMainWidget( new MyPageConfigBase(this) , "MyGroup" ); * } @@ -53,44 +53,45 @@ class KConfig; class KOPETE_EXPORT KCAutoConfigModule : public KCModule { Q_OBJECT + TQ_OBJECT public: /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( TQWidget * tqparent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( KInstance * instance, TQWidget * tqparent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. * @param config the KConfig to use * @param instance KInstance object for this KCM - * @param parent parent widget + * @param tqparent tqparent widget * @param args special arguments for this KCM * * @todo document what the args mean (inherited from KCModule?) */ - KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * tqparent = 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 parent parent widget + * @param tqparent tqparent widget * @param name name of the object * @param args special arguments for this KCM */ - KCAutoConfigModule(KConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, TQWidget * tqparent = 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 parent. + * @p widget must have this module as tqparent. * * This method automatically call KAutoConfig::addWidget() and KAutoConfig::retrieveSettings() * @@ -113,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 parent KCModule::load() + * You can also reimplement this method, but you should always call the tqparent KCModule::load() * be sure you know what you are doing */ virtual void load(); @@ -121,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 parent KCModule::save() + * You can also reimplement this method, but you should always call the tqparent KCModule::save() * be sure you know what you are doing */ virtual void save(); @@ -129,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 parent KCModule::defaults() + * You can also reimplement this method, but you should always call the tqparent 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 4b41b48b..ddda9bd7 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -63,8 +63,8 @@ struct KNotification::Private int level; }; -KNotification::KNotification(TQObject *parent) : - TQObject(parent) , d(new Private) +KNotification::KNotification(TQObject *tqparent) : + TQObject(tqparent) , d(new Private) { m_linkClicked = false; } @@ -109,7 +109,7 @@ void KNotification::notifyByMessagebox() return; TQString action=d->actions[0]; - WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; if( action.isEmpty()) { @@ -139,16 +139,16 @@ void KNotification::notifyByMessagebox() { default: case KNotifyClient::Notification: - result = KMessageBox::questionYesNo(d->widget, d->text, i18n( "Notification" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::questionYesNo(d->widget, d->text, i18n( "Notification" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Warning: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Warning" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Warning" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Error: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Error" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Error" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Catastrophe: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Fatal" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Fatal" ), action, KStdGuiItem::cancel(), TQString(), false ); break; } if(result==KMessageBox::Yes && _this) @@ -171,12 +171,12 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) TQString title = config.readEntry( "Comment", appName ); //KPassivePopup::message(title, text, icon, senderWinId); - WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; KPassivePopup *pop = new KPassivePopup( checkWinId(appName, winId) ); TQObject::connect(this, TQT_SIGNAL(closed()), pop, TQT_SLOT(deleteLater())); - TQVBox *vb = pop->standardView( title, pix.isNull() ? d->text: TQString::null , icon ); + TQVBox *vb = pop->standardView( title, pix.isNull() ? d->text: TQString() , icon ); TQVBox *vb2=vb; if(!pix.isNull()) @@ -198,22 +198,22 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) } vb=new TQVBox(hb); TQLabel *msg = new TQLabel( d->text, vb, "msg_label" ); - msg->setAlignment( AlignLeft ); + msg->tqsetAlignment( AlignLeft ); } if ( !d->actions.isEmpty() ) { - TQString linkCode=TQString::fromLatin1("<p align=\"right\">"); + TQString linkCode=TQString::tqfromLatin1("<p align=\"right\">"); int i=0; for ( TQStringList::ConstIterator it = d->actions.begin() ; it != d->actions.end(); ++it ) { i++; - linkCode+=TQString::fromLatin1(" <a href=\"%1\">%2</a> ").arg( TQString::number(i) , TQStyleSheet::escape(*it) ); + linkCode+=TQString::tqfromLatin1(" <a href=\"%1\">%2</a> ").tqarg( TQString::number(i) , TQStyleSheet::escape(*it) ); } - linkCode+=TQString::fromLatin1("</p>"); + linkCode+=TQString::tqfromLatin1("</p>"); KActiveLabel *link = new KActiveLabel(linkCode , vb ); - //link->setAlignment( AlignRight ); + //link->tqsetAlignment( AlignRight ); TQObject::disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), link, TQT_SLOT(openLink(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotPopupLinkClicked(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), pop, TQT_SLOT(hide())); @@ -284,7 +284,7 @@ void KNotification::raiseWidget(TQWidget *w) } else { - TQWidget *pw=w->parentWidget(); + TQWidget *pw=w->tqparentWidget(); raiseWidget(pw); if( TQTabWidget *tab_widget=dynamic_cast<TQTabWidget*>(pw)) @@ -368,12 +368,12 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p */ - KNotification *notify=new KNotification(widget); + KNotification *notify=new KNotification(TQT_TQOBJECT(widget)); notify->d->widget=widget; notify->d->text=text; notify->d->actions=actions; notify->d->level=level; - WId winId=widget ? widget->topLevelWidget()->winId() : 0; + WId winId=widget ? widget->tqtopLevelWidget()->winId() : 0; //we will catch some event that will not be fired by the old deamon @@ -401,7 +401,7 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p if ( present & KNotifyClient::Execute ) { TQString appname = TQString::fromAscii( KNotifyClient::instance()->instanceName() ); - notify->notifyByExecute(commandline, TQString::null,appname,text, winId, 0 ); + notify->notifyByExecute(commandline, TQString(),appname,text, winId, 0 ); } return notify; @@ -479,7 +479,7 @@ static KNotification *performCustomNotifications( TQWidget *widget, Kopete::Meta evt->firePresentation( Kopete::EventPresentation::Chat ); } // fire the event - n=KNotification::userEvent( text, mc->photo(), widget, TQStringList() , present, 0, sound, TQString::null, TQString::null , KNotification::CloseOnTimeout); + n=KNotification::userEvent( text, mc->photo(), widget, TQStringList() , present, 0, sound, TQString(), TQString() , KNotification::CloseOnTimeout); } } diff --git a/kopete/libkopete/knotification.h b/kopete/libkopete/knotification.h index 1e570541..ece07bf6 100644 --- a/kopete/libkopete/knotification.h +++ b/kopete/libkopete/knotification.h @@ -51,9 +51,10 @@ namespace Kopete { class MetaContact; } * * @author Olivier Goffart <ogoffart @ kde.org> */ -class KOPETE_EXPORT KNotification : public QObject +class KOPETE_EXPORT KNotification : public TQObject { Q_OBJECT + TQ_OBJECT public: enum NotificationFlags @@ -139,7 +140,7 @@ public slots: private: struct Private; Private *d; - KNotification(TQObject *parent=0L); + KNotification(TQObject *tqparent=0L); /** * recursive function that raise the widget. @p w * @@ -175,9 +176,9 @@ 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 bitmask of NotificationsFlags + * @param flags is a bittqmask of NotificationsFlags */ - static KNotification *event( const TQString& eventId , const TQString& text=TQString::null, + static KNotification *event( const TQString& eventId , const TQString& text=TQString(), const TQPixmap& pixmap=TQPixmap(), TQWidget *widget=0L, const TQStringList &actions=TQStringList(), unsigned int flags=CloseOnTimeout); @@ -192,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 parent - * @param commandLine the command line to run if selected with @p parent + * @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 flags Indicates the way in which the notification should be handled */ static KNotification *userEvent( const TQString& text, const TQPixmap& pixmap, @@ -206,7 +207,7 @@ public: /** * @todo find a proper way to do context-dependent notifications */ - static KNotification *event( Kopete::MetaContact *mc, const TQString& eventId , const TQString& text=TQString::null, + static KNotification *event( Kopete::MetaContact *mc, const TQString& eventId , const TQString& text=TQString(), const TQPixmap& pixmap=TQPixmap(), TQWidget *widget=0L, const TQStringList &actions=TQStringList(),unsigned int flags=CloseOnTimeout); diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index acce1da1..11f668d8 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -79,21 +79,21 @@ public: KConfigGroup *configGroup; uint connectionTry; TQString customIcon; - Kopete::OnlineStatus restoreStatus; + Kopete::OnlineStatus restoretqStatus; TQString restoreMessage; }; -Account::Account( Protocol *parent, const TQString &accountId, const char *name ) - : TQObject( parent, name ), d( new Private( parent, accountId ) ) +Account::Account( Protocol *tqparent, const TQString &accountId, const char *name ) + : TQObject( tqparent, name ), d( new Private( tqparent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(KGlobal::config(), TQString::tqfromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); d->customIcon = d->configGroup->readEntry( "Icon", TQString() ); d->priority = d->configGroup->readNumEntry( "Priority", 0 ); - d->restoreStatus = Kopete::OnlineStatus::Online; + d->restoretqStatus = Kopete::OnlineStatus::Online; d->restoreMessage = ""; TQObject::connect( &d->suppressStatusTimer, TQT_SIGNAL( timeout() ), @@ -118,8 +118,8 @@ Account::~Account() void Account::reconnect() { - kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; - setOnlineStatus( d->restoreStatus, d->restoreMessage ); + kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoretqStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; + setOnlineStatus( d->restoretqStatus, d->restoreMessage ); } void Account::disconnected( DisconnectReason reason ) @@ -139,7 +139,7 @@ void Account::disconnected( DisconnectReason reason ) } if(reason== OtherClient) { - Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).arg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); + Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).tqarg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); } } @@ -255,7 +255,7 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr if ( contactId == d->myself->contactId() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") ); return false; } @@ -278,55 +278,55 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr } else { - // should we here add the contact to the parentContact if any? + // should we here add the contact to the tqparentContact if any? kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl; } return c->metaContact(); } - MetaContact *parentContact = new MetaContact(); + MetaContact *tqparentContact = new MetaContact(); if(!displayName.isEmpty()) - parentContact->setDisplayName( displayName ); + tqparentContact->setDisplayName( displayName ); //Set it as a temporary contact if requested if ( isTemporary ) - parentContact->setTemporary( true ); + tqparentContact->setTemporary( true ); else - parentContact->addToGroup( group ); + tqparentContact->addToGroup( group ); if ( c ) { - c->setMetaContact( parentContact ); + c->setMetaContact( tqparentContact ); if ( mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( parentContact ); + KABCPersistence::self()->write( tqparentContact ); } } else { - if ( !createContact( contactId, parentContact ) ) + if ( !createContact( contactId, tqparentContact ) ) { - delete parentContact; + delete tqparentContact; return 0L; } } - ContactList::self()->addMetaContact( parentContact ); - return parentContact; + ContactList::self()->addMetaContact( tqparentContact ); + return tqparentContact; } -bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMode mode ) +bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) { if ( contactId == myself()->contactId() ) { KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") ); return 0L; } - bool isTemporary= parent->isTemporary(); + bool isTemporary= tqparent->isTemporary(); Contact *c = d->contacts[ contactId ]; if ( c && c->metaContact() ) { @@ -336,23 +336,23 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod "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(parent); + c->setMetaContact(tqparent); return true; } else { - // should we here add the contact to the parentContact if any? + // should we here add the contact to the tqparentContact if any? kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl; } return false; //(the contact is not in the correct metacontact, so false) } - bool success = createContact(contactId, parent); + bool success = createContact(contactId, tqparent); if ( success && mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( parent ); + KABCPersistence::self()->write( tqparent ); } return success; @@ -361,11 +361,11 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod KActionMenu * Account::actionMenu() { //default implementation - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) + menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); OnlineStatusManager::self()->createAccountStatusActions(this, menu); @@ -383,7 +383,7 @@ bool Account::isConnected() const bool Account::isAway() const { - return d->myself && ( d->myself->onlineStatus().status() == Kopete::OnlineStatus::Away ); + return d->myself && ( d->myself->onlinetqStatus().status() == Kopete::OnlineStatus::Away ); } Contact * Account::myself() const @@ -417,12 +417,12 @@ void Account::setMyself( Contact *myself ) } void Account::slotOnlineStatusChanged( Contact * /* contact */, - const OnlineStatus &newStatus, const OnlineStatus &oldStatus ) + const OnlineStatus &newtqStatus, const OnlineStatus &oldtqStatus ) { - bool wasOffline = !oldStatus.isDefinitelyOnline(); - bool isOffline = !newStatus.isDefinitelyOnline(); + bool wasOffline = !oldtqStatus.isDefinitelyOnline(); + bool isOffline = !newtqStatus.isDefinitelyOnline(); - if ( wasOffline || newStatus.status() == OnlineStatus::Offline ) + if ( wasOffline || newtqStatus.status() == OnlineStatus::Offline ) { // Wait for five seconds until we treat status notifications for contacts // as unrelated to our own status change. @@ -437,19 +437,19 @@ void Account::slotOnlineStatusChanged( Contact * /* contact */, if ( !isOffline ) { - d->restoreStatus = newStatus; + d->restoretqStatus = newtqStatus; d->restoreMessage = myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); -// kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; +// kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoretqStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; } /* kdDebug(14010) << k_funcinfo << "account " << d->id << " changed status. was " - << Kopete::OnlineStatus::statusTypeToString(oldStatus.status()) << ", is " - << Kopete::OnlineStatus::statusTypeToString(newStatus.status()) << endl;*/ + << Kopete::OnlineStatus::statusTypeToString(oldtqStatus.status()) << ", is " + << Kopete::OnlineStatus::statusTypeToString(newtqStatus.status()) << endl;*/ if ( wasOffline != isOffline ) emit isConnectedChanged(); } -void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) +void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) { d->suppressStatusNotification = true; d->suppressStatusTimer.start( 5000, true ); @@ -462,7 +462,7 @@ void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) void Account::slotContactPropertyChanged( Contact * /* contact */, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { - if ( key == TQString::fromLatin1("awayMessage") && old != newVal && isConnected() ) + if ( key == TQString::tqfromLatin1("awayMessage") && old != newVal && isConnected() ) { d->restoreMessage = newVal.toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreMessage " << d->restoreMessage << endl; @@ -508,9 +508,9 @@ bool Account::isBlocked( const TQString &contactId ) return d->blackList->isBlocked( contactId ); } -void Account::editAccount(TQWidget *parent) +void Account::editAccount(TQWidget *tqparent) { - KDialogBase *editDialog = new KDialogBase( parent, "KopeteAccountConfig::editDialog", true, + KDialogBase *editDialog = new KDialogBase( tqparent, "KopeteAccountConfig::editDialog", true, i18n( "Edit Account" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); @@ -518,7 +518,7 @@ void Account::editAccount(TQWidget *parent) if ( !m_accountWidget ) return; - // FIXME: Why the #### is EditAccountWidget not a QWidget?!? This sideways casting + // FIXME: Why the #### is EditAccountWidget not a TQWidget?!? This sideways casting // is braindead and error-prone. Looking at MSN the only reason I can see is // because it allows direct subclassing of designer widgets. But what is // wrong with embedding the designer widget in an empty TQWidget instead? @@ -550,7 +550,7 @@ TQString Account::pluginData( Plugin* /*plugin*/, const TQString &key ) const void Account::setAway(bool away, const TQString& reason) { - setOnlineStatus( OnlineStatusManager::self()->onlineStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); + setOnlineStatus( OnlineStatusManager::self()->onlinetqStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); } void Account::setCustomIcon( const TQString & i) diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 8782673c..44f12eb1 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -63,19 +63,20 @@ class BlackLister; * * @author Olivier Goffart <ogoffart@tiscalinet.be> */ -class KOPETE_EXPORT Account : public QObject +class KOPETE_EXPORT Account : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( AddMode ) - Q_PROPERTY( TQString accountId READ accountId ) - Q_PROPERTY( bool excludeConnect READ excludeConnect WRITE setExcludeConnect ) - Q_PROPERTY( TQColor color READ color WRITE setColor ) - Q_PROPERTY( TQPixmap accountIcon READ accountIcon ) - Q_PROPERTY( bool isConnected READ isConnected ) - Q_PROPERTY( bool isAway READ isAway ) - Q_PROPERTY( bool suppressStatusNotification READ suppressStatusNotification ) - Q_PROPERTY( uint priority READ priority WRITE setPriority ) + TQ_PROPERTY( TQString accountId READ accountId ) + TQ_PROPERTY( bool excludeConnect READ excludeConnect WRITE setExcludeConnect ) + TQ_PROPERTY( TQColor color READ color WRITE setColor ) + TQ_PROPERTY( TQPixmap accountIcon READ accountIcon ) + TQ_PROPERTY( bool isConnected READ isConnected ) + TQ_PROPERTY( bool isAway READ isAway ) + TQ_PROPERTY( bool suppressStatusNotification READ suppressStatusNotification ) + TQ_PROPERTY( uint priority READ priority WRITE setPriority ) public: /** @@ -97,12 +98,12 @@ public: }; /** - * @param parent the protocol for this account. The account is a child object of the + * @param tqparent 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 *parent, const TQString &accountID, const char *name=0L); + Account(Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); /** @@ -181,7 +182,7 @@ public: /** * \brief change the account icon. * by default the icon of an account is the protocol one, but it may be overide it. - * Set TQString::null to go back to the default (the protocol icon) + * Set TQString() to go back to the default (the protocol icon) * * this call will emit colorChanged() */ @@ -264,28 +265,28 @@ public: * If @p mode is @c DontChangeKABC, no additional action is carried out. * * @param contactId the @ref Contact::contactId of the contact to create - * @param displayName the displayname (alias) of the new metacontact. Leave as TQString::null if + * @param displayName the displayname (alias) of the new metacontact. Leave as TQString() if * no alias is known, then by default, the nick will be taken as alias and tracked if changed. * @param group the group to add the created metacontact to, or 0 for the top-level group. * @param mode the mode used to add the contact. Use DontChangeKABC when deserializing. * @return the new created metacontact or 0L if the operation failed */ - MetaContact* addContact( const TQString &contactId, const TQString &displayName = TQString::null, Group *group = 0, AddMode mode = DontChangeKABC ) ; + MetaContact* addContact( const TQString &contactId, const TQString &displayName = TQString(), Group *group = 0, AddMode mode = DontChangeKABC ) ; /** * @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 parent. + * a new contact with that ID is created, and added to the metacontact @p tqparent. * * @param contactId the @ref Contact::contactId of the contact to create - * @param parent the parent metacontact (must not be 0) + * @param tqparent the tqparent 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 *parent, AddMode mode = DontChangeKABC ); + bool addContact( const TQString &contactId, MetaContact *tqparent, AddMode mode = DontChangeKABC ); /** * @brief Indicate whether the account is connected at all. @@ -300,7 +301,7 @@ public: /** * @brief Indicate whether the account is away. * - * This is a convenience method that queries @ref Contact::onlineStatus() on @ref myself(). + * This is a convenience method that queries @ref Contact::onlinetqStatus() on @ref myself(). * This function is safe to call if @ref setMyself() has not been called yet. */ bool isAway() const; @@ -352,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 parent metacontact + * The myself should have the @ref ContactList::myself() as tqparent metacontact * */ void setMyself( Contact *myself ); @@ -363,16 +364,16 @@ 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 parent. + * new custom @ref Contact, using @p tqparentContact as the tqparent. * * If the metacontact is not temporary and the protocol supports it, you can add the * contact to the server. * * @param contactId the ID of the contact to create - * @param parentContact the metacontact to add this contact to + * @param tqparentContact the metacontact to add this contact to * @return @c true if creating the contact succeeded, @c false on failure. */ - virtual bool createContact( const TQString &contactId, MetaContact *parentContact ) =0; + virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ) =0; /** @@ -408,7 +409,7 @@ protected slots: * * @param status the status to set all contacts of this account except @ref myself() to. */ - void setAllContactsStatus( const Kopete::OnlineStatus &status ); + void setAllContactstqStatus( const Kopete::OnlineStatus &status ); signals: /** @@ -449,10 +450,10 @@ public slots: /** * @brief Go online for this service. * - * @param initialStatus is the status to connect with. If it is an invalid status for this + * @param initialtqStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ) = 0; + virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ) = 0; /** * @brief Go offline for this service. @@ -470,7 +471,7 @@ public slots: * * @todo change ; make use of setOnlineStatus */ - virtual void setAway( bool away, const TQString &reason = TQString::null ); + virtual void setAway( bool away, const TQString &reason = TQString() ); /** * Reimplement this function to set the online status @@ -478,12 +479,12 @@ public slots: * @param reason is the away message to set. * @note If needed, you need to connect. if the offline status is given, you should disconnect */ - virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null ) = 0; + virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ) = 0; /** * Display the edit account widget for the account */ - void editAccount( TQWidget* parent = 0L ); + void editAccount( TQWidget* tqparent = 0L ); /** * Add a user to the blacklist. The default implementation calls @@ -515,7 +516,7 @@ private slots: /** * The @ref myself() contact's online status changed. */ - void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ); + void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ); /** * The @ref myself() contact's property changed. diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index d12aa7ce..f3671d10 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -75,7 +75,7 @@ AccountManager * AccountManager::self() AccountManager::AccountManager() -: TQObject( qApp, "KopeteAccountManager" ) +: TQObject( tqApp, "KopeteAccountManager" ) { d = new Private; } @@ -138,7 +138,7 @@ void AccountManager::setAwayAll( const TQString &awayReason, bool away ) { // FIXME: ICQ's invisible online should be set to invisible away Contact *self = it.current()->myself(); - bool isInvisible = self && self->onlineStatus().status() == OnlineStatus::Invisible; + bool isInvisible = self && self->onlinetqStatus().status() == OnlineStatus::Invisible; if ( anyConnected ) { if ( it.current()->isConnected() && !isInvisible ) @@ -160,7 +160,7 @@ void AccountManager::setOnlineStatus( uint category , const TQString& awayMessag for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it ) { Account *account = it.current(); - Kopete::OnlineStatus status = OnlineStatusManager::self()->onlineStatus(account->protocol() , katgor); + Kopete::OnlineStatus status = OnlineStatusManager::self()->onlinetqStatus(account->protocol() , katgor); if ( anyConnected ) { if ( account->isConnected() || ( (flags & ConnectIfOffline) && !account->excludeConnect() ) ) @@ -196,22 +196,22 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const color = TQColor(); break; case 1: - color = Qt::red; + color = TQt::red; break; case 2: - color = Qt::green; + color = TQt::green; break; case 3: - color = Qt::blue; + color = TQt::blue; break; case 4: - color = Qt::yellow; + color = TQt::yellow; break; case 5: - color = Qt::magenta; + color = TQt::magenta; break; case 6: - color = Qt::cyan; + color = TQt::cyan; break; } @@ -220,7 +220,7 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const Account* AccountManager::registerAccount( Account *account ) { - if( !account || d->accounts.contains( account ) ) + if( !account || d->accounts.tqcontains( account ) ) return account; if( account->accountId().isEmpty() ) @@ -314,7 +314,7 @@ void AccountManager::removeAccount( Account *account ) Group* group = mc->groups().first(); TQPtrList<MetaContact> groupMembers = group->members(); ContactList::self()->removeMetaContact( mc ); - if ( groupMembers.count() == 1 && groupMembers.findRef( mc ) != -1 ) + if ( groupMembers.count() == 1 && groupMembers.tqfindRef( mc ) != -1 ) ContactList::self()->removeGroup( group ); } } @@ -332,7 +332,7 @@ void AccountManager::removeAccount( Account *account ) { // FIXME: pluginId() should return the internal name and not the class name, so // we can get rid of this hack - Olivier/Martijn - TQString protocolName = protocol->pluginId().remove( TQString::fromLatin1( "Protocol" ) ).lower(); + TQString protocolName = protocol->pluginId().remove( TQString::tqfromLatin1( "Protocol" ) ).lower(); PluginManager::self()->setPluginEnabled( protocolName, false ); PluginManager::self()->unloadPlugin( protocolName ); @@ -365,14 +365,14 @@ void AccountManager::load() // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); TQString protocol = config->readEntry( "Protocol" ); - if ( protocol.endsWith( TQString::fromLatin1( "Protocol" ) ) ) - protocol = TQString::fromLatin1( "kopete_" ) + protocol.lower().remove( TQString::fromLatin1( "protocol" ) ); + if ( protocol.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) + protocol = TQString::tqfromLatin1( "kopete_" ) + protocol.lower().remove( TQString::tqfromLatin1( "protocol" ) ); if ( config->readBoolEntry( "Enabled", true ) ) PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync ); @@ -388,7 +388,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); @@ -423,14 +423,14 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) } void AccountManager::slotAccountOnlineStatusChanged(Contact *c, - const OnlineStatus &oldStatus, const OnlineStatus &newStatus) + const OnlineStatus &oldtqStatus, const OnlineStatus &newtqStatus) { Account *account = c->account(); if (!account) return; //kdDebug(14010) << k_funcinfo << endl; - emit accountOnlineStatusChanged(account, oldStatus, newStatus); + emit accountOnlineStatusChanged(account, oldtqStatus, newtqStatus); } } //END namespace Kopete diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h index 75ebf667..cfca90d3 100644 --- a/kopete/libkopete/kopeteaccountmanager.h +++ b/kopete/libkopete/kopeteaccountmanager.h @@ -43,9 +43,10 @@ class OnlineStatus; * @author Martijn Klingens <klingens@kde.org> * @author Olivier Goffart <ogoffart@ tiscalinet.be> */ -class KOPETE_EXPORT AccountManager : public QObject +class KOPETE_EXPORT AccountManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -139,10 +140,10 @@ public slots: * * @param category is one of the Kopete::OnlineStatusManager::Categories * @param awayMessage is the new away message - * @param flags is a bitmask of SetOnlineStatusFlag + * @param flags is a bittqmask of SetOnlineStatusFlag */ void setOnlineStatus( /*Kopete::OnlineStatusManager::Categories*/ uint category, - const TQString& awayMessage = TQString::null, uint flags=0); + const TQString& awayMessage = TQString(), uint flags=0); /** * \brief Set all accounts to away at once. @@ -152,7 +153,7 @@ public slots: * @param awayReason is the away message that will be set. * @param away decides whether the message is away/non-away */ - void setAwayAll( const TQString &awayReason = TQString::null, bool away=true ); + void setAwayAll( const TQString &awayReason = TQString(), bool away=true ); /** * \brief Connect or make available every account. @@ -162,7 +163,7 @@ public slots: * This is a slot, so you can connect directly to it from e.g. a KAction. * @param awayReason is the away(status) message that will be set. */ - void setAvailableAll( const TQString &awayReason = TQString::null ); + void setAvailableAll( const TQString &awayReason = TQString() ); /** * \internal @@ -195,11 +196,11 @@ signals: * \brief An account has changed its onlinestatus * Technically this monitors Account::myself() onlinestatus changes * \param account Account which changed its onlinestatus - * \param oldStatus The online status before the change - * \param newStatus The new online status + * \param oldtqStatus The online status before the change + * \param newtqStatus The new online status */ void accountOnlineStatusChanged(Kopete::Account *account, - const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); + const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); private: /** @@ -210,7 +211,7 @@ private: private slots: void slotPluginLoaded( Kopete::Plugin *plugin ); void slotAccountOnlineStatusChanged(Kopete::Contact *c, - const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); + const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); /** * \internal diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 1c920f31..04ac9a03 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <ksettings/dispatcher.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xatom.h> #include <X11/Xresource.h> @@ -50,7 +50,7 @@ #define HasScreenSaver #include <X11/extensions/scrnsaver.h> #endif -#endif // Q_WS_X11 +#endif // TQ_WS_X11 // As this is an untested X extension we better leave it off #undef HAVE_XIDLE @@ -74,8 +74,8 @@ struct KopeteAwayPrivate int mouse_x; int mouse_y; - unsigned int mouse_mask; -#ifdef Q_WS_X11 + unsigned int mouse_tqmask; +#ifdef TQ_WS_X11 Window root; /* root window the pointer is on */ Screen* screen; /* screen the pointer is on */ @@ -95,8 +95,8 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") d = new KopeteAwayPrivate; // Set up the away messages - d->awayMessage = TQString::null; - d->autoAwayMessage = TQString::null; + d->awayMessage = TQString(); + d->autoAwayMessage = TQString(); d->useAutoAwayMessage = false; d->globalAway = false; d->autoaway = false; @@ -106,12 +106,12 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") d->awayMessageList.clear(); // set the XAutoLock info -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display *dsp = qt_xdisplay(); #endif d->mouse_x = d->mouse_y=0; - d->mouse_mask = 0; -#ifdef Q_WS_X11 + d->mouse_tqmask = 0; +#ifdef TQ_WS_X11 d->root = DefaultRootWindow (dsp); d->screen = ScreenOfDisplay (dsp, DefaultScreen (dsp)); #endif @@ -124,12 +124,12 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") if(!d->useXidle) d->useMit = XScreenSaverQueryExtension(qt_xdisplay(), &dummy, &dummy); #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->xIdleTime = 0; #endif kdDebug(14010) << k_funcinfo << "Idle detection methods:" << endl; kdDebug(14010) << k_funcinfo << "\tKScreensaverIface::isBlanked()" << endl; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(14010) << k_funcinfo << "\tX11 XQueryPointer()" << endl; #endif if (d->useXidle) @@ -293,7 +293,7 @@ TQString Kopete::Away::getMessage( uint messageNumber ) } else { - return TQString::null; + return TQString(); } } @@ -368,11 +368,11 @@ bool Kopete::Away::isActivity() bool activity = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display *dsp = qt_xdisplay(); Window dummy_w; int dummy_c; - unsigned int mask; /* modifier mask */ + unsigned int tqmask; /* modifier tqmask */ 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, &mask)) + &dummy_c, &dummy_c, &tqmask)) { /* * 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 || mask != d->mouse_mask + if (root_x != d->mouse_x || root_y != d->mouse_y || tqmask != d->mouse_tqmask || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000)) { - // -1 => just gone autoaway, ignore apparent activity this time round + // -1 => just gone autoaway, ignore aptqparent activity this time round // anything else => genuine activity // See setAutoAway(). if (d->mouse_x != -1) @@ -444,10 +444,10 @@ bool Kopete::Away::isActivity() } d->mouse_x = root_x; d->mouse_y = root_y; - d->mouse_mask = mask; + d->mouse_tqmask = tqmask; d->xIdleTime = xIdleTime; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 // ================================================================================= return activity; @@ -469,7 +469,7 @@ void Kopete::Away::setActive() { if(i->isConnected() && i->isAway()) { - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Online ) ); } @@ -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 apparent idle/mouse/keyboard changes. + // fires it should ignore any aptqparent 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. @@ -499,21 +499,21 @@ void Kopete::Away::setAutoAway() TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { - if(i->myself()->onlineStatus().status() == Kopete::OnlineStatus::Online) + if(i->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Online) { d->autoAwayAccounts.append(i); if(d->useAutoAwayMessage) { // Display a specific away message - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->autoAwayMessage); } else { // Display the last away message used - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->awayMessage); } diff --git a/kopete/libkopete/kopeteaway.h b/kopete/libkopete/kopeteaway.h index e6a171b1..90d07469 100644 --- a/kopete/libkopete/kopeteaway.h +++ b/kopete/libkopete/kopeteaway.h @@ -54,9 +54,10 @@ namespace Kopete * @author Olivier Goffart <ogoffart @ kde.org> */ -class KOPETE_EXPORT Away : public QObject +class KOPETE_EXPORT Away : public TQObject { Q_OBJECT + TQ_OBJECT friend class ::KopeteAwayDialog; diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index ded2a830..c72d94bc 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 *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, 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 *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( status ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -84,7 +84,7 @@ void AwayAction::slotAwayChanged() TQStringList menu; menu << i18n( "No Message" ); menu << i18n( "New Message..." ); - menu << TQString::null ; //separator + menu << TQString() ; //separator menu += awayMessages ; setItems( menu ); setCurrentItem( -1 ); @@ -106,11 +106,11 @@ void AwayAction::slotSelectAway( int index ) switch(index) { case 0: - awayReason = TQString::null; + awayReason = TQString(); break; case 1: bool ok; - awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString::null , &ok ); + awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString() , &ok ); if(!ok) //the user canceled return; if( !awayReason.isEmpty() ) diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h index c787e7e7..6bc64581 100644 --- a/kopete/libkopete/kopeteawayaction.h +++ b/kopete/libkopete/kopeteawayaction.h @@ -40,26 +40,27 @@ class OnlineStatus; class KOPETE_EXPORT AwayAction : public KSelectAction { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent 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 *parent, const char *name = 0); + TQObject *tqparent, 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 parent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent 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 *parent, const char *name = 0); + TQObject *tqparent, const char *name = 0); /** * Destructor. diff --git a/kopete/libkopete/kopeteawaydialog.cpp b/kopete/libkopete/kopeteawaydialog.cpp index 19d9fb9c..944e379f 100644 --- a/kopete/libkopete/kopeteawaydialog.cpp +++ b/kopete/libkopete/kopeteawaydialog.cpp @@ -33,8 +33,8 @@ public: KopeteAwayDialog_Base *base; }; -KopeteAwayDialog::KopeteAwayDialog( TQWidget *parent, const char *name ) -: KDialogBase( parent, name, true, i18n( "Global Away Message" ), +KopeteAwayDialog::KopeteAwayDialog( TQWidget *tqparent, const char *name ) +: KDialogBase( tqparent, 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 517e419c..1c494e60 100644 --- a/kopete/libkopete/kopeteawaydialog.h +++ b/kopete/libkopete/kopeteawaydialog.h @@ -53,14 +53,15 @@ class KopeteAwayDialogPrivate; class KOPETE_EXPORT KopeteAwayDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor for the Away Dialog - * @param parent The object that owns this + * @param tqparent The object that owns this * @param name Name for this object */ - KopeteAwayDialog( TQWidget *parent = 0, const char *name = 0 ); + KopeteAwayDialog( TQWidget *tqparent = 0, const char *name = 0 ); /** * Destructor diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 29dbf727..cf6ff95e 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -34,15 +34,15 @@ public: }; -BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) - : TQObject(parent, name), d( new Private ) +BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *tqparent, const char *name) + : TQObject(tqparent, name), d( new Private ) { KConfig *config = KGlobal::config(); d->owner = accountId; d->protocol = protocolId; config->setGroup("BlackLister"); - d->blacklist = config->readListEntry( d->protocol + TQString::fromLatin1("_") + d->owner ); + d->blacklist = config->readListEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner ); } BlackLister::~BlackLister() @@ -53,7 +53,7 @@ BlackLister::~BlackLister() bool BlackLister::isBlocked(const TQString &contactId) { - return (d->blacklist.find( contactId ) != d->blacklist.end() ); + return (d->blacklist.tqfind( contactId ) != d->blacklist.end() ); } bool BlackLister::isBlocked(Contact *contact) @@ -90,7 +90,7 @@ void BlackLister::saveToDisk() KConfig *config = KGlobal::config(); config->setGroup("BlackLister"); - config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); + config->writeEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner, d->blacklist ); config->sync(); } diff --git a/kopete/libkopete/kopeteblacklister.h b/kopete/libkopete/kopeteblacklister.h index c2df1bca..d5c946fe 100644 --- a/kopete/libkopete/kopeteblacklister.h +++ b/kopete/libkopete/kopeteblacklister.h @@ -42,19 +42,20 @@ class Contact; * * @author Roie Kerstein <sf_kersteinroie@bezeqint.net> */ -class BlackLister : public QObject +class BlackLister : public TQObject { Q_OBJECT + TQ_OBJECT 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 parent The TQObject parent for this class. + * @param tqparent The TQObject tqparent for this class. * @param name The TQObject name for this class. */ - BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *parent = 0, const char *name = 0 ); + BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *tqparent = 0, const char *name = 0 ); ~BlackLister(); /** diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index 91866cce..f396a659 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -49,7 +49,7 @@ class KMMPrivate public: Kopete::ContactPtrList mContactList; const Kopete::Contact *mUser; - TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contactStatus; + TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contacttqStatus; Kopete::Protocol *mProtocol; bool isEmpty; bool mCanBeDeleted; @@ -101,27 +101,27 @@ Kopete::ChatSession::~ChatSession() delete d; } -void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ) +void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ) { slotUpdateDisplayName(); - emit onlineStatusChanged((Kopete::Contact*)c, status, oldStatus); + emit onlineStatusChanged((Kopete::Contact*)c, status, oldtqStatus); } void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { - Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ]; - d->contactStatus[ contact ] = status; + Kopete::OnlineStatus oldtqStatus = d->contacttqStatus[ contact ]; + d->contacttqStatus[ contact ] = status; disconnect( contact, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); - emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldStatus ); + emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldtqStatus ); } const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const { - if ( d->contactStatus.contains( contact ) ) - return d->contactStatus[ contact ]; + if ( d->contacttqStatus.tqcontains( contact ) ) + return d->contacttqStatus[ contact ]; - return contact->onlineStatus(); + return contact->onlinetqStatus(); } const TQString Kopete::ChatSession::displayName() @@ -152,11 +152,11 @@ void Kopete::ChatSession::slotUpdateDisplayName() if ( !c ) return; - d->displayName=TQString::null; + d->displayName=TQString(); do { if(! d->displayName.isNull() ) - d->displayName.append( TQString::fromLatin1( ", " ) ) ; + d->displayName.append( TQString::tqfromLatin1( ", " ) ) ; if ( c->metaContact() ) d->displayName.append( c->metaContact()->displayName() ); @@ -171,7 +171,7 @@ void Kopete::ChatSession::slotUpdateDisplayName() //If we have only 1 contact, add the status of him if ( d->mContactList.count() == 1 ) { - d->displayName.append( TQString::fromLatin1( " (%1)" ).arg( d->mContactList.first()->onlineStatus().description() ) ); + d->displayName.append( TQString::tqfromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlinetqStatus().description() ) ); } emit displayNameChanged(); @@ -248,7 +248,7 @@ void Kopete::ChatSession::sendMessage( Kopete::Message &message ) emit messageSent( sentMessage, this ); if ( !account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) { - KNotification::event(TQString::fromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); + KNotification::event(TQString::tqfromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); } } else @@ -264,7 +264,7 @@ void Kopete::ChatSession::messageSucceeded() void Kopete::ChatSession::emitNudgeNotification() { - KNotification::event( TQString::fromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); + KNotification::event( TQString::tqfromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); } void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).arg( nick ), false ) ) ) + msg.plainBody().tqcontains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } @@ -294,17 +294,17 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) // emit messageAppended( msg, this ); } -void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress ) +void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress ) { - if( !d->contactStatus.contains(c) ) - d->contactStatus[ c ] = initialStatus; + if( !d->contacttqStatus.tqcontains(c) ) + d->contacttqStatus[ c ] = initialtqStatus; addContact( c, suppress ); } void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) { //kdDebug( 14010 ) << k_funcinfo << endl; - if ( d->mContactList.contains( c ) ) + if ( d->mContactList.tqcontains( c ) ) { kdDebug( 14010 ) << k_funcinfo << "Contact already exists" <<endl; emit contactAdded( c, suppress ); @@ -331,7 +331,7 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) else disconnect( old, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); emit contactAdded( c, suppress ); - emit contactRemoved( old, TQString::null ); + emit contactRemoved( old, TQString() ); } else { @@ -359,7 +359,7 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQString& reason, Kopete::Message::MessageFormat format, bool suppressNotification ) { kdDebug( 14010 ) << k_funcinfo << endl; - if ( !c || !d->mContactList.contains( c ) ) + if ( !c || !d->mContactList.tqcontains( c ) ) return; if ( d->mContactList.count() == 1 ) @@ -386,7 +386,7 @@ void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQStrin slotUpdateDisplayName(); } - d->contactStatus.remove( c ); + d->contacttqStatus.remove( c ); emit contactRemoved( c, reason, format, suppressNotification ); } @@ -472,14 +472,14 @@ void Kopete::ChatSession::slotContactDestroyed( Kopete::Contact *contact ) if(contact == myself()) deleteLater(); - if( !contact || !d->mContactList.contains( contact ) ) + if( !contact || !d->mContactList.tqcontains( contact ) ) return; //This is a workaround to prevent crash if the contact get deleted. // in the best case, we should ask the protocol to recreate a temporary contact. // (remember: the contact may be deleted when the users removes it from the contactlist, or when closing kopete ) d->mContactList.remove( contact ); - emit contactRemoved( contact, TQString::null ); + emit contactRemoved( contact, TQString() ); if ( d->mContactList.isEmpty() ) deleteLater(); diff --git a/kopete/libkopete/kopetechatsession.h b/kopete/libkopete/kopetechatsession.h index 928ac7d5..802a4e39 100644 --- a/kopete/libkopete/kopetechatsession.h +++ b/kopete/libkopete/kopetechatsession.h @@ -77,6 +77,7 @@ class KOPETE_EXPORT ChatSession : public TQObject , public KXMLGUIClient friend class ChatSessionManager; Q_OBJECT + TQ_OBJECT public: /** @@ -129,7 +130,7 @@ public: * Set a special icon for a contact in this kmm only. * by default, all contact have their own status */ - void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newStatus ); + void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newtqStatus ); /** * @brief get the status of a contact. @@ -148,7 +149,7 @@ public: * @param requestedPlugin Specifies the view plugin to use if we have to create one. */ // FIXME: canCreate should definitely be an enum and not a bool - Martijn - KopeteView* view( bool canCreate = false, const TQString &requestedPlugin = TQString::null ); + KopeteView* view( bool canCreate = false, const TQString &requestedPlugin = TQString() ); /** * says if you may invite contact from the same account to this chat with @ref inviteContact @@ -288,20 +289,20 @@ public slots: * @param c is the contact * @param suppress mean the there will be no automatic notifications in the chatwindow. * (note that i don't like the param suppress at all. it is used in irc to show a different notification (with an info text) - * a QStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) + * a TQStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) */ void addContact( const Kopete::Contact *c, bool suppress = false ); /** * Add a contact to the session with a pre-set initial status * @param c is the contact - * @param initialStatus The initial contactOnlineStatus of the contact + * @param initialtqStatus The initial contactOnlineStatus of the contact * @param suppress mean the there will be no automatic notifications in the chatwindow. * (note that i don't like the param suppress at all. it is used in irc to show a different notification (with an info text) - * a QStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) + * a TQStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) * @see contactOnlineStatus */ - void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress = false ); + void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress = false ); /** * Remove a contact from the session @@ -310,7 +311,7 @@ public slots: * @param format The format of the message * @param suppressNotification prevents a notification of the removal in the chat view. See note in @ref addContact */ - void removeContact( const Kopete::Contact *contact, const TQString& reason = TQString::null, Kopete::Message::MessageFormat format = Message::PlainText, bool suppressNotification = false ); + void removeContact( const Kopete::Contact *contact, const TQString& reason = TQString(), Kopete::Message::MessageFormat format = Message::PlainText, bool suppressNotification = false ); /** * Set if the KMM will be deleted when the chatwindow is deleted. It is useful if you want @@ -370,7 +371,7 @@ public slots: private slots: void slotUpdateDisplayName(); void slotViewDestroyed(); - void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); void slotContactDestroyed( Kopete::Contact *contact ); protected: diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 4805927b..24029604 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -38,14 +38,14 @@ ChatSessionManager* ChatSessionManager::s_self = 0L; ChatSessionManager* ChatSessionManager::self() { if( !s_self ) - s_self = new ChatSessionManager( kapp ); + s_self = new ChatSessionManager( TQT_TQOBJECT(kapp) ); return s_self; } -ChatSessionManager::ChatSessionManager( TQObject* parent, +ChatSessionManager::ChatSessionManager( TQObject* tqparent, const char* name ) - : TQObject( parent, name ) + : TQObject( tqparent, name ) { d=new Private; s_self = this; @@ -81,7 +81,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, Contact *tmpContact; for (tmpContact = contactlist.first(); tmpContact && halfMatch; tmpContact = contactlist.next()) { - if ( !chatContacts.containsRef( tmpContact ) ) + if ( !chatContacts.tqcontainsRef( tmpContact ) ) halfMatch = false; } @@ -91,7 +91,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, bool fullMatch = true; for (tmpContact = chatContacts.first(); tmpContact && fullMatch; tmpContact = chatContacts.next()) { - if ( !contactlist.containsRef( tmpContact ) ) + if ( !contactlist.tqcontainsRef( tmpContact ) ) fullMatch = false; } // We have a winner diff --git a/kopete/libkopete/kopetechatsessionmanager.h b/kopete/libkopete/kopetechatsessionmanager.h index efabd604..bc1635d8 100644 --- a/kopete/libkopete/kopetechatsessionmanager.h +++ b/kopete/libkopete/kopetechatsessionmanager.h @@ -46,9 +46,10 @@ typedef TQValueList<Message> MessageList; * Kopete::ChatSessionManager is responsible for creating and tracking Kopete::ChatSession * instances for each chat. */ -class KOPETE_EXPORT ChatSessionManager : public QObject +class KOPETE_EXPORT ChatSessionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static ChatSessionManager* self(); @@ -97,7 +98,7 @@ public: * create a new view for the manager. * only the manager should call this function */ - KopeteView *createView( Kopete::ChatSession * , const TQString &requestedPlugin = TQString::null ); + KopeteView *createView( Kopete::ChatSession * , const TQString &requestedPlugin = TQString() ); /** * Post a new event. this will emit the @ref newEvent signal @@ -175,7 +176,7 @@ public slots: void slotReadMessage(); private: - ChatSessionManager( TQObject* parent = 0, const char* name = 0 ); + ChatSessionManager( TQObject* tqparent = 0, const char* name = 0 ); class Private; Private *d; diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index cd4dcd8c..a01d06e4 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -38,14 +38,14 @@ using Kopete::CommandList; typedef TQMap<TQObject*, CommandList> PluginCommandMap; typedef TQMap<TQString,TQString> CommandMap; -typedef QPair<Kopete::ChatSession*, Kopete::Message::MessageDirection> ManagerPair; +typedef TQPair<Kopete::ChatSession*, Kopete::Message::MessageDirection> ManagerPair; class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient { public: KopeteCommandGUIClient( Kopete::ChatSession *manager ) : TQObject(manager), KXMLGUIClient(manager) { - setXMLFile( TQString::fromLatin1("kopetecommandui.rc") ); + setXMLFile( TQString::tqfromLatin1("kopetecommandui.rc") ); TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild().firstChild(); @@ -57,15 +57,15 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient { KAction *a = static_cast<KAction*>( it.current() ); actionCollection()->insert( a ); - TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") ); - newNode.setAttribute( TQString::fromLatin1("name"), - TQString::fromLatin1( a->name() ) ); + TQDomElement newNode = doc.createElement( TQString::tqfromLatin1("Action") ); + newNode.setAttribute( TQString::tqfromLatin1("name"), + TQString::tqfromLatin1( a->name() ) ); bool added = false; for( TQDomElement n = menu.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if( TQString::fromLatin1(a->name()) < n.attribute(TQString::fromLatin1("name"))) + if( TQString::tqfromLatin1(a->name()) < n.attribute(TQString::tqfromLatin1("name"))) { menu.insertBefore( newNode, n ); added = true; @@ -94,7 +94,7 @@ struct CommandHandlerPrivate CommandHandlerPrivate *Kopete::CommandHandler::p = 0L; -Kopete::CommandHandler::CommandHandler() : TQObject( qApp ) +Kopete::CommandHandler::CommandHandler() : TQObject( tqApp ) { p->s_handler = this; p->inCommand = false; @@ -103,33 +103,33 @@ Kopete::CommandHandler::CommandHandler() : TQObject( qApp ) mCommands.setAutoDelete( true ); p->pluginCommands.insert( this, mCommands ); - registerCommand( this, TQString::fromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /help [<command>] - Used to list available commands, or show help for a specified command." ), 0, 1 ); - registerCommand( this, TQString::fromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /close - Closes the current view." ) ); // FIXME: What's the difference with /close? The help doesn't explain it - Martijn - registerCommand( this, TQString::fromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /part - Closes the current view." ) ); - registerCommand( this, TQString::fromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /clear - Clears the active view's chat buffer." ) ); - //registerCommand( this, TQString::fromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), + //registerCommand( this, TQString::tqfromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), // i18n( "USAGE: /me <text> - Formats message as in '<nickname> went to the store'." ) ); - registerCommand( this, TQString::fromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /away [<reason>] - Marks you as away/back for the current account only." ) ); - registerCommand( this, TQString::fromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts." ) ); - registerCommand( this, TQString::fromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /say <text> - Say text in this chat. This is the same as just typing a message, but is very " "useful for scripts." ), 1 ); - registerCommand( this, TQString::fromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /exec [-o] <command> - Executes the specified command and displays the output in the chat buffer. " "If -o is specified, the output is sent to all members of the chat."), 1 ); @@ -156,43 +156,43 @@ Kopete::CommandHandler *Kopete::CommandHandler::commandHandler() return p->s_handler; } -void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, +void Kopete::CommandHandler::registerCommand( TQObject *tqparent, 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( parent, lowerCommand, handlerSlot, help, - Normal, TQString::null, minArgs, maxArgs, cut, pix); - p->pluginCommands[ parent ].insert( lowerCommand, mCommand ); + Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerCommand, handlerSlot, help, + Normal, TQString(), minArgs, maxArgs, cut, pix); + p->pluginCommands[ tqparent ].insert( lowerCommand, mCommand ); } -void Kopete::CommandHandler::unregisterCommand( TQObject *parent, const TQString &command ) +void Kopete::CommandHandler::unregisterCommand( TQObject *tqparent, const TQString &command ) { - if( p->pluginCommands[ parent ].find(command) ) - p->pluginCommands[ parent ].remove( command ); + if( p->pluginCommands[ tqparent ].tqfind(command) ) + p->pluginCommands[ tqparent ].remove( command ); } -void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString, +void Kopete::CommandHandler::registerAlias( TQObject *tqparent, 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( parent, lowerAlias, 0L, help, type, + Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerAlias, 0L, help, type, formatString, minArgs, maxArgs, cut, pix ); - p->pluginCommands[ parent ].insert( lowerAlias, mCommand ); + p->pluginCommands[ tqparent ].insert( lowerAlias, mCommand ); } -void Kopete::CommandHandler::unregisterAlias( TQObject *parent, const TQString &alias ) +void Kopete::CommandHandler::unregisterAlias( TQObject *tqparent, const TQString &alias ) { - if( p->pluginCommands[ parent ].find(alias) ) - p->pluginCommands[ parent ].remove( alias ); + if( p->pluginCommands[ tqparent ].tqfind(alias) ) + p->pluginCommands[ tqparent ].remove( alias ); } bool Kopete::CommandHandler::processMessage( const TQString &msg, Kopete::ChatSession *manager ) { if( p->inCommand ) return false; - TQRegExp splitRx( TQString::fromLatin1("^/([\\S]+)(.*)") ); + TQRegExp splitRx( TQString::tqfromLatin1("^/([\\S]+)(.*)") ); TQString command; TQString args; if(splitRx.search(msg) != -1) @@ -255,7 +255,7 @@ void Kopete::CommandHandler::slotHelpCommand( const TQString &args, Kopete::Chat if( c && !c->help().isNull() ) output = c->help(); else - output = i18n("There is no help available for '%1'.").arg( command ); + output = i18n("There is no help available for '%1'.").tqarg( command ); } Kopete::Message msg(manager->myself(), manager->members(), output, Kopete::Message::Internal, Kopete::Message::PlainText); @@ -275,18 +275,18 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat if( !args.isEmpty() ) { KProcess *proc = 0L; - if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) ) + if ( kapp->authorize( TQString::tqfromLatin1( "shell_access" ) ) ) proc = new KProcess(manager); if( proc ) { - *proc << TQString::fromLatin1("sh") << TQString::fromLatin1("-c"); + *proc << TQString::tqfromLatin1("sh") << TQString::tqfromLatin1("-c"); TQStringList argsList = parseArguments( args ); - if( argsList.front() == TQString::fromLatin1("-o") ) + if( argsList.front() == TQString::tqfromLatin1("-o") ) { p->processMap.insert( proc, ManagerPair(manager, Kopete::Message::Outbound) ); - *proc << args.section(TQRegExp(TQString::fromLatin1("\\s+")), 1); + *proc << args.section(TQRegExp(TQString::tqfromLatin1("\\s+")), 1); } else { @@ -371,7 +371,7 @@ void Kopete::CommandHandler::slotExecFinished(KProcess *proc) TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) { TQStringList arguments; - TQRegExp quotedArgs( TQString::fromLatin1("\"(.*)\"") ); + TQRegExp quotedArgs( TQString::tqfromLatin1("\"(.*)\"") ); quotedArgs.setMinimal( true ); if ( quotedArgs.search( args ) != -1 ) @@ -380,7 +380,7 @@ TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) arguments.append( quotedArgs.cap(i) ); } - TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::fromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); + TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::tqfromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); for( TQStringList::Iterator it = otherArgs.begin(); it != otherArgs.end(); ++it ) arguments.append( *it ); @@ -470,7 +470,7 @@ void Kopete::CommandHandler::slotViewCreated( KopeteView *view ) void Kopete::CommandHandler::slotPluginLoaded( Kopete::Plugin *plugin ) { connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); - if( !p->pluginCommands.contains( plugin ) ) + if( !p->pluginCommands.tqcontains( plugin ) ) { //Create a TQDict optomized for a larger # of commands, and case insensitive CommandList mCommands(31, false); diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index 9632f872..aeb93529 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -45,11 +45,12 @@ typedef TQDict<Command> CommandList; * * The Kopete::CommandHandler can handle /action like messages */ -class KOPETE_EXPORT CommandHandler : public QObject +class KOPETE_EXPORT CommandHandler : public TQObject { friend class ::KopeteCommandGUIClient; Q_OBJECT + TQ_OBJECT public: /** @@ -73,7 +74,7 @@ class KOPETE_EXPORT CommandHandler : public QObject * Kopete::CommandHandler). These commands can also be overridden by * registering a new duplicate command. * - * @param parent The plugin who owns this command + * @param tqparent 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 @@ -85,14 +86,14 @@ class KOPETE_EXPORT CommandHandler : public QObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, - const TQString &help = TQString::null, uint minArgs = 0, int maxArgs = -1, - const KShortcut &cut = 0, const TQString &pix = TQString::null ); + void registerCommand( TQObject *tqparent, 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 parent The plugin who owns this alias + * @param tqparent 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, @@ -106,15 +107,15 @@ class KOPETE_EXPORT CommandHandler : public QObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerAlias( TQObject *parent, + void registerAlias( TQObject *tqparent, const TQString &alias, const TQString &formatString, - const TQString &help = TQString::null, + const TQString &help = TQString(), CommandType = SystemAlias, uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, - const TQString &pix = TQString::null ); + const TQString &pix = TQString() ); /** * \brief Unregister a command. @@ -123,19 +124,19 @@ class KOPETE_EXPORT CommandHandler : public QObject * This function should only be called in the case of a plugin which loads and * unloads commands dynamically. * - * @param parent The plugin who owns this command + * @param tqparent The plugin who owns this command * @param command The command to unload */ - void unregisterCommand( TQObject *parent, const TQString &command ); + void unregisterCommand( TQObject *tqparent, const TQString &command ); /** * \brief Unregister an alias. * - * \see unregisterCommand( TQObject *parent, const TQString &command ) - * @param parent The plugin who owns this alias + * \see unregisterCommand( TQObject *tqparent, const TQString &command ) + * @param tqparent The plugin who owns this alias * @param alias The alais to unload */ - void unregisterAlias( TQObject *parent, const TQString &alias ); + void unregisterAlias( TQObject *tqparent, 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 546958ef..5dc2871d 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -63,7 +63,7 @@ struct Contact::Private public: bool fileCapable; - OnlineStatus onlineStatus; + OnlineStatus onlinetqStatus; Account *account; MetaContact *metaContact; @@ -79,15 +79,15 @@ public: }; Contact::Contact( Account *account, const TQString &contactId, - MetaContact *parent, const TQString &icon ) - : TQObject( parent ) + MetaContact *tqparent, const TQString &icon ) + : TQObject( tqparent ) { d = new Private; //kdDebug( 14010 ) << k_funcinfo << "Creating contact with id " << contactId << endl; d->contactId = contactId; - d->metaContact = parent; + d->metaContact = tqparent; 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 parent + // Need to check this because myself() may have no tqparent // Maybe too the metaContact doesn't have a valid protocol() // (ex: for unit tests or chat window style preview) - if( parent && protocol() ) + if( tqparent && protocol() ) { - connect( parent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + connect( tqparent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); - parent->addContact( this ); + tqparent->addContact( this ); } @@ -124,45 +124,45 @@ Contact::~Contact() -OnlineStatus Contact::onlineStatus() const +OnlineStatus Contact::onlinetqStatus() const { if ( this == account()->myself() || account()->isConnected() ) - return d->onlineStatus; + return d->onlinetqStatus; else - return protocol()->accountOfflineStatus(); + return protocol()->accountOfflinetqStatus(); } void Contact::setOnlineStatus( const OnlineStatus &status ) { - if( status == d->onlineStatus ) + if( status == d->onlinetqStatus ) return; - OnlineStatus oldStatus = d->onlineStatus; - d->onlineStatus = status; + OnlineStatus oldtqStatus = d->onlinetqStatus; + d->onlinetqStatus = status; Kopete::Global::Properties *globalProps = Kopete::Global::Properties::self(); // Contact changed from Offline to another status - if( oldStatus.status() == OnlineStatus::Offline && + if( oldtqStatus.status() == OnlineStatus::Offline && status.status() != OnlineStatus::Offline ) { - setProperty( globalProps->onlineSince(), TQDateTime::currentDateTime() ); + setProperty( globalProps->onlineSince(), TQDateTime::tqcurrentDateTime() ); /*kdDebug(14010) << k_funcinfo << "REMOVING lastSeen property for " << d->displayName << endl;*/ removeProperty( globalProps->lastSeen() ); } - else if( oldStatus.status() != OnlineStatus::Offline && - oldStatus.status() != OnlineStatus::Unknown && + else if( oldtqStatus.status() != OnlineStatus::Offline && + oldtqStatus.status() != OnlineStatus::Unknown && status.status() == OnlineStatus::Offline ) // Contact went back offline { removeProperty( globalProps->onlineSince() ); /*kdDebug(14010) << k_funcinfo << "SETTING lastSeen property for " << d->displayName << endl;*/ - setProperty( globalProps->lastSeen(), TQDateTime::currentDateTime() ); + setProperty( globalProps->lastSeen(), TQDateTime::tqcurrentDateTime() ); } if ( this == account()->myself() || account()->isConnected() ) - emit onlineStatusChanged( this, status, oldStatus ); + emit onlineStatusChanged( this, status, oldtqStatus ); } void Contact::slotAccountIsConnectedChanged() @@ -171,9 +171,9 @@ void Contact::slotAccountIsConnectedChanged() return; if ( account()->isConnected() ) - emit onlineStatusChanged( this, d->onlineStatus, protocol()->accountOfflineStatus() ); + emit onlineStatusChanged( this, d->onlinetqStatus, protocol()->accountOfflinetqStatus() ); else - emit onlineStatusChanged( this, protocol()->accountOfflineStatus(), d->onlineStatus ); + emit onlineStatusChanged( this, protocol()->accountOfflinetqStatus(), d->onlinetqStatus ); } @@ -202,15 +202,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) TQString titleText; TQString nick = property( Kopete::Global::Properties::self()->nickName() ).value().toString(); if( nick.isEmpty() ) - titleText = TQString::fromLatin1( "%1 (%2)" ).arg( contactId(), onlineStatus().description() ); + titleText = TQString::tqfromLatin1( "%1 (%2)" ).tqarg( contactId(), onlinetqStatus().description() ); else - titleText = TQString::fromLatin1( "%1 <%2> (%3)" ).arg( nick, contactId(), onlineStatus().description() ); + titleText = TQString::tqfromLatin1( "%1 <%2> (%3)" ).tqarg( nick, contactId(), onlinetqStatus().description() ); menu->insertTitle( titleText ); if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) { - KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ), - 0, this, TQT_SLOT( slotAddContact() ), menu, "actionAddContact" ); + KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::tqfromLatin1( "add_user" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" ); actionAddContact->plug( menu ); menu->insertSeparator(); } @@ -219,15 +219,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) bool reach = account()->isConnected() && isReachable(); bool myself = (this == account()->myself()); - KAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQT_SLOT( sendMessage() ), menu, "actionSendMessage" ); + KAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" ); actionSendMessage->setEnabled( reach && !myself ); actionSendMessage->plug( menu ); - KAction *actionChat = KopeteStdAction::chat( this, TQT_SLOT( startChat() ), menu, "actionChat" ); + KAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" ); actionChat->setEnabled( reach && !myself ); actionChat->plug( menu ); - KAction *actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( sendFile() ), menu, "actionSendFile" ); + KAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" ); actionSendFile->setEnabled( reach && d->fileCapable && !myself ); actionSendFile->plug( menu ); @@ -248,9 +248,9 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) menu->insertSeparator(); if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::changeMetaContact( this, TQT_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu ); + KopeteStdAction::changeMetaContact( TQT_TQOBJECT(this), TQT_SLOT( changeMetaContact() ), TQT_TQOBJECT(menu), "actionChangeMetaContact" )->plug( menu ); - KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu ); + KopeteStdAction::contactInfo( TQT_TQOBJECT(this), TQT_SLOT( slotUserInfo() ), TQT_TQOBJECT(menu), "actionUserInfo" )->plug( menu ); #if 0 //this is not fully implemented yet (and doesn't work). disable for now - Olivier 2005-01-11 if ( account()->isBlocked( d->contactId ) ) @@ -260,7 +260,7 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) #endif if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::deleteContact( this, TQT_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu ); + KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), TQT_TQOBJECT(menu), "actionDeleteContact" )->plug( menu ); return menu; } @@ -314,8 +314,8 @@ void Contact::setMetaContact( MetaContact *m ) { //only one contact, including this one, that mean the contact will be empty efter the move result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), i18n( "You are moving the contact `%1' to the meta contact `%2'.\n" "`%3' will be empty afterwards. Do you want to delete this contact?" ) - .arg(contactId(), m ? m->displayName() : TQString::null, old->displayName()) - , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::fromLatin1("delete_old_contact_when_move") ); + .tqarg(contactId(), m ? m->displayName() : TQString(), old->displayName()) + , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::tqfromLatin1("delete_old_contact_when_move") ); if(result==KMessageBox::Cancel) return; } @@ -368,7 +368,7 @@ void Contact::serializeProperties(TQMap<TQString, TQString> &serializedData) continue; TQVariant val = it.data().value(); - TQString key = TQString::fromLatin1("prop_%1_%2").arg(TQString::fromLatin1(val.typeName()), it.key()); + TQString key = TQString::tqfromLatin1("prop_%1_%2").tqarg(TQString::tqfromLatin1(val.typeName()), it.key()); serializedData[key] = val.toString(); @@ -383,7 +383,7 @@ void Contact::deserializeProperties( { TQString key = it.key(); - if ( !key.startsWith( TQString::fromLatin1("prop_") ) ) // avoid parsing other serialized data + if ( !key.startsWith( TQString::tqfromLatin1("prop_") ) ) // avoid parsing other serialized data continue; TQStringList keyList = TQStringList::split( TQChar('_'), key, false ); @@ -419,20 +419,20 @@ bool Contact::isReachable() { // The default implementation returns false when offline and true // otherwise. Subclass if you need more control over the process. - return onlineStatus().status() != OnlineStatus::Offline; + return onlinetqStatus().status() != OnlineStatus::Offline; } void Contact::startChat() { - KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_chatwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_chatwindow") ); if(v) v->raise(true); } void Contact::sendMessage() { - KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_emailwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_emailwindow") ); if(v) v->raise(true); } @@ -458,8 +458,8 @@ void Contact::slotDelete() { if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n( "Are you sure you want to remove the contact '%1' from your contact list?" ). - arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::fromLatin1("delete_user") ), - TQString::fromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) + arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::tqfromLatin1("delete_user") ), + TQString::tqfromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { deleteContact(); @@ -524,7 +524,7 @@ TQPtrList<KAction> *Contact::customContextMenuActions( ChatSession * /* manager bool Contact::isOnline() const { - return onlineStatus().isDefinitelyOnline(); + return onlinetqStatus().isDefinitelyOnline(); } @@ -575,7 +575,7 @@ TQStringList Contact::properties() const bool Contact::hasProperty(const TQString &key) const { - return d->properties.contains(key); + return d->properties.tqcontains(key); } const ContactProperty &Contact::property(const TQString &key) const @@ -645,8 +645,8 @@ TQString Contact::toolTip() const // -------------------------------------------------------------------------- // Fixed part of tooltip - TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .arg( KURL::encode_string( protocol()->pluginId() ), + TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + .tqarg( KURL::encode_string( protocol()->pluginId() ), KURL::encode_string( account()->accountId() ), KURL::encode_string( contactId() ) ); @@ -656,14 +656,14 @@ TQString Contact::toolTip() const { tip = i18n( "<b>DISPLAY NAME</b><br><img src=\"%2\"> CONTACT STATUS", "<b><nobr>%3</nobr></b><br><img src=\"%2\"> %1" ). - arg( Kopete::Message::escape( onlineStatus().description() ), iconName, + arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, Kopete::Message::escape( d->contactId ) ); } else { tip = i18n( "<b>DISPLAY NAME</b> (CONTACT ID)<br><img src=\"%2\"> CONTACT STATUS", "<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\"> %1" ). - arg( Kopete::Message::escape( onlineStatus().description() ), iconName, + arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, Kopete::Message::escape( contactId() ), Kopete::Emoticons::parseEmoticons( Kopete::Message::escape( nick ) ) ); } @@ -673,25 +673,25 @@ TQString Contact::toolTip() const for(TQStringList::Iterator it=shownProps.begin(); it!=shownProps.end(); ++it) { - if((*it) == TQString::fromLatin1("FormattedName")) + if((*it) == TQString::tqfromLatin1("FormattedName")) { TQString name = formattedName(); if(!name.isEmpty()) { tip += i18n("<br><b>Full Name:</b> FORMATTED NAME", - "<br><b>Full Name:</b> <nobr>%1</nobr>").arg(TQStyleSheet::escape(name)); + "<br><b>Full Name:</b> <nobr>%1</nobr>").tqarg(TQStyleSheet::escape(name)); } } - else if ((*it) == TQString::fromLatin1("FormattedIdleTime")) + else if ((*it) == TQString::tqfromLatin1("FormattedIdleTime")) { TQString time = formattedIdleTime(); if(!time.isEmpty()) { tip += i18n("<br><b>Idle:</b> FORMATTED IDLE TIME", - "<br><b>Idle:</b> <nobr>%1</nobr>").arg(time); + "<br><b>Idle:</b> <nobr>%1</nobr>").tqarg(time); } } - else if ((*it) == TQString::fromLatin1("homePage")) + else if ((*it) == TQString::tqfromLatin1("homePage")) { TQString url = property(*it).value().toString(); if(!url.isEmpty()) @@ -701,7 +701,7 @@ TQString Contact::toolTip() const arg( KURL::encode_string( url ), Kopete::Message::escape( TQStyleSheet::escape(url) ) ); } } - else if ((*it) == TQString::fromLatin1("awayMessage")) + else if ((*it) == TQString::tqfromLatin1("awayMessage")) { TQString awaymsg = property(*it).value().toString(); if(!awaymsg.isEmpty()) @@ -755,21 +755,21 @@ TQString Contact::toolTip() const TQString Kopete::Contact::formattedName() const { - if( hasProperty(TQString::fromLatin1("FormattedName")) ) - return property(TQString::fromLatin1("FormattedName")).value().toString(); + if( hasProperty(TQString::tqfromLatin1("FormattedName")) ) + return property(TQString::tqfromLatin1("FormattedName")).value().toString(); TQString ret; Kopete::ContactProperty first, last; - first = property(TQString::fromLatin1("firstName")); - last = property(TQString::fromLatin1("lastName")); + first = property(TQString::tqfromLatin1("firstName")); + last = property(TQString::tqfromLatin1("lastName")); if(!first.isNull()) { if(!last.isNull()) // contact has both first and last name { ret = i18n("firstName lastName", "%2 %1") - .arg(last.value().toString()) - .arg(first.value().toString()); + .tqarg(last.value().toString()) + .tqarg(first.value().toString()); } else // only first name set { @@ -804,23 +804,23 @@ TQString Kopete::Contact::formattedIdleTime() const { ret = i18n( "<days>d <hours>h <minutes>m <seconds>s", "%4d %3h %2m %1s" ) - .arg( secs ) - .arg( mins ) - .arg( hours ) - .arg( days ); + .tqarg( secs ) + .tqarg( mins ) + .tqarg( hours ) + .tqarg( days ); } else if ( hours != 0 ) { ret = i18n( "<hours>h <minutes>m <seconds>s", "%3h %2m %1s" ) - .arg( secs ) - .arg( mins ) - .arg( hours ); + .tqarg( secs ) + .tqarg( mins ) + .tqarg( hours ); } else { ret = i18n( "<minutes>m <seconds>s", "%2m %1s" ) - .arg( secs ) - .arg( mins ); + .tqarg( secs ) + .tqarg( mins ); } } return ret; diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h index 3cefbb2a..4f8454fc 100644 --- a/kopete/libkopete/kopetecontact.h +++ b/kopete/libkopete/kopetecontact.h @@ -51,28 +51,29 @@ typedef TQPtrList<Group> GroupList; * This class abstracts a generic contact * Use it for inserting contacts in the contact list for example. */ -class KOPETE_EXPORT Contact : public QObject +class KOPETE_EXPORT Contact : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( CanCreateFlags ) - Q_PROPERTY( TQString formattedName READ formattedName ) - Q_PROPERTY( TQString formattedIdleTime READ formattedIdleTime ) - Q_PROPERTY( bool isOnline READ isOnline ) - Q_PROPERTY( bool fileCapable READ isFileCapable WRITE setFileCapable ) - Q_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) - //Q_PROPERTY( bool isReachable READ isReachable ) - Q_PROPERTY( TQString contactId READ contactId ) - Q_PROPERTY( TQString icon READ icon WRITE setIcon ) - Q_PROPERTY( TQString toolTip READ toolTip ) - Q_PROPERTY( TQString nickName READ nickName WRITE setNickName ) - //Q_PROPERTY( unsigned long idleTime READ idleTime WRITE setIdleTime ) + TQ_PROPERTY( TQString formattedName READ formattedName ) + TQ_PROPERTY( TQString formattedIdleTime READ formattedIdleTime ) + TQ_PROPERTY( bool isOnline READ isOnline ) + TQ_PROPERTY( bool fileCapable READ isFileCapable WRITE setFileCapable ) + TQ_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) + //TQ_PROPERTY( bool isReachable READ isReachable ) + TQ_PROPERTY( TQString contactId READ contactId ) + TQ_PROPERTY( TQString icon READ icon WRITE setIcon ) + TQ_PROPERTY( TQString toolTip READ toolTip ) + TQ_PROPERTY( TQString nickName READ nickName WRITE setNickName ) + //TQ_PROPERTY( unsigned long idleTime READ idleTime WRITE setIdleTime ) public: /** * \brief Create new contact. * - * <b>The parent MetaContact must not be NULL</b> + * <b>The tqparent 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. @@ -81,13 +82,13 @@ 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 parent account. this constructor automatically register the contact to the account + * @param account is the tqparent account. this constructor automatically register the contact to the account * @param id is the Contact's unique Id (mostly the user's login) - * @param parent is the parent @ref MetaContact this Contact is part of + * @param tqparent is the tqparent @ref MetaContact this Contact is part of * @param icon is an optional icon */ - Contact( Account *account, const TQString &id, MetaContact *parent, - const TQString &icon = TQString::null ); + Contact( Account *account, const TQString &id, MetaContact *tqparent, + const TQString &icon = TQString() ); ~Contact(); @@ -203,7 +204,7 @@ public: * @brief Get the online status of the contact * @return the online status of the contact */ - OnlineStatus onlineStatus() const; + OnlineStatus onlinetqStatus() const; /** * \brief Set the contact's online status @@ -217,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 parent. + * Actions should have the collection as tqparent. * * @return Collection of menu items to be show on the context menu * @todo if possible, try to use KXMLGUI @@ -448,7 +449,7 @@ public slots: * * default implementation does nothing * - * @param changed is a bitmask of the @ref Changed enum which say why the call to this funtion is done. + * @param changed is a bittqmask of the @ref Changed enum which say why the call to this funtion is done. */ virtual void sync(unsigned int changed = 0xFF); @@ -475,7 +476,7 @@ public slots: * file size (such as over asocket */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: @@ -509,7 +510,7 @@ signals: * The contact's online status changed */ void onlineStatusChanged( Kopete::Contact *contact, - const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); /** * The contact is about to be destroyed. diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 6e33f257..65960dcf 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 parent which will call this constructor -> infinite loop + //ContactList::self() as tqparent which will call this constructor -> infinite loop d->myself=0L; //no contactlist loaded yet, don't save them @@ -218,7 +218,7 @@ TQPtrList<Group> ContactList::selectedGroups() const void ContactList::addMetaContact( MetaContact *mc ) { - if ( d->contacts.contains( mc ) ) + if ( d->contacts.tqcontains( mc ) ) return; d->contacts.append( mc ); @@ -232,13 +232,13 @@ void ContactList::addMetaContact( MetaContact *mc ) void ContactList::removeMetaContact(MetaContact *m) { - if ( !d->contacts.contains(m) ) + if ( !d->contacts.tqcontains(m) ) { kdDebug(14010) << k_funcinfo << "Trying to remove a not listed MetaContact." << endl; return; } - if ( d->selectedMetaContacts.contains( m ) ) + if ( d->selectedMetaContacts.tqcontains( m ) ) { d->selectedMetaContacts.remove( m ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -259,7 +259,7 @@ void ContactList::removeMetaContact(MetaContact *m) void ContactList::addGroup( Group * g ) { - if(!d->groups.contains(g) ) + if(!d->groups.tqcontains(g) ) { d->groups.append( g ); emit groupAdded( g ); @@ -269,7 +269,7 @@ void ContactList::addGroup( Group * g ) void ContactList::removeGroup( Group *g ) { - if ( d->selectedGroups.contains( g ) ) + if ( d->selectedGroups.tqcontains( g ) ) { d->selectedGroups.remove( g ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -378,14 +378,14 @@ void ContactList::loadXML() // don't save when we're in the middle of this... d->loaded = false; - TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); if( filename.isEmpty() ) { d->loaded=true; return ; } - TQDomDocument contactList( TQString::fromLatin1( "kopete-contact-list" ) ); + TQDomDocument contactList( TQString::tqfromLatin1( "kopete-contact-list" ) ); TQFile contactListFile( filename ); contactListFile.open( IO_ReadOnly ); @@ -393,10 +393,10 @@ void ContactList::loadXML() TQDomElement list = contactList.documentElement(); - TQString versionString = list.attribute( TQString::fromLatin1( "version" ), TQString::null ); + TQString versionString = list.attribute( TQString::tqfromLatin1( "version" ), TQString() ); uint version = 0; - if( TQRegExp( TQString::fromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) - version = versionString.replace( TQString::fromLatin1( "." ), TQString::null ).toUInt(); + if( TQRegExp( TQString::tqfromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) + version = versionString.tqreplace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); if( version < Private::ContactListVersion ) { @@ -410,7 +410,7 @@ void ContactList::loadXML() convertContactList( filename, version, Private::ContactListVersion ); - contactList = TQDomDocument ( TQString::fromLatin1( "kopete-contact-list" ) ); + contactList = TQDomDocument ( TQString::tqfromLatin1( "kopete-contact-list" ) ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); @@ -423,10 +423,10 @@ void ContactList::loadXML() TQDomElement element = list.firstChild().toElement(); while( !element.isNull() ) { - if( element.tagName() == TQString::fromLatin1("meta-contact") ) + if( element.tagName() == TQString::tqfromLatin1("meta-contact") ) { //TODO: id isn't used - //TQString id = element.attribute( "id", TQString::null ); + //TQString id = element.attribute( "id", TQString() ); Kopete::MetaContact *metaContact = new Kopete::MetaContact(); if ( !metaContact->fromXML( element ) ) { @@ -439,7 +439,7 @@ void ContactList::loadXML() metaContact ); } } - else if( element.tagName() == TQString::fromLatin1("kopete-group") ) + else if( element.tagName() == TQString::tqfromLatin1("kopete-group") ) { Kopete::Group *group = new Kopete::Group(); if( !group->fromXML( element ) ) @@ -453,7 +453,7 @@ void ContactList::loadXML() } } // Only load myself metacontact information when Global Identity is enabled. - else if( element.tagName() == TQString::fromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) + else if( element.tagName() == TQString::tqfromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) { if( !myself()->fromXML( element ) ) { @@ -479,19 +479,19 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // changes to allow incremental (multi-pass) conversion so we don't have // to rewrite the whole conversion code for each change. - TQDomDocument contactList( TQString::fromLatin1( "messaging-contact-list" ) ); + TQDomDocument contactList( TQString::tqfromLatin1( "messaging-contact-list" ) ); TQFile contactListFile( fileName ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); TQDomElement oldList = contactList.documentElement(); - TQDomDocument newList( TQString::fromLatin1( "kopete-contact-list" ) ); - newList.appendChild( newList.createProcessingInstruction( TQString::fromLatin1( "xml" ), TQString::fromLatin1( "version=\"1.0\"" ) ) ); + TQDomDocument newList( TQString::tqfromLatin1( "kopete-contact-list" ) ); + newList.appendChild( newList.createProcessingInstruction( TQString::tqfromLatin1( "xml" ), TQString::tqfromLatin1( "version=\"1.0\"" ) ) ); - TQDomElement newRoot = newList.createElement( TQString::fromLatin1( "kopete-contact-list" ) ); + TQDomElement newRoot = newList.createElement( TQString::tqfromLatin1( "kopete-contact-list" ) ); newList.appendChild( newRoot ); - newRoot.setAttribute( TQString::fromLatin1( "version" ), TQString::fromLatin1( "1.0" ) ); + newRoot.setAttribute( TQString::tqfromLatin1( "version" ), TQString::tqfromLatin1( "1.0" ) ); TQDomNode oldNode = oldList.firstChild(); while( !oldNode.isNull() ) @@ -499,10 +499,10 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldElement = oldNode.toElement(); if( !oldElement.isNull() ) { - if( oldElement.tagName() == TQString::fromLatin1("meta-contact") ) + if( oldElement.tagName() == TQString::tqfromLatin1("meta-contact") ) { // Ignore ID, it is not used in the current list anyway - TQDomElement newMetaContact = newList.createElement( TQString::fromLatin1( "meta-contact" ) ); + TQDomElement newMetaContact = newList.createElement( TQString::tqfromLatin1( "meta-contact" ) ); newRoot.appendChild( newMetaContact ); // Plugin data is stored completely different, and requires @@ -518,48 +518,48 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers while( !oldContactNode.isNull() ) { TQDomElement oldContactElement = oldContactNode.toElement(); - if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::fromLatin1("address-book-field") ) + if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::tqfromLatin1("address-book-field") ) { // Convert address book fields. // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will // be called "aim". MSN, AIM, IRC, Oscar and SMS don't use address // book fields yet; Gadu and ICQ can be converted as-is. // As Yahoo is unfinished we won't try to convert at all. - TQString id = oldContactElement.attribute( TQString::fromLatin1( "id" ), TQString::null ); + TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "id" ), TQString() ); TQString data = oldContactElement.text(); TQString app, key, val; - TQString separator = TQString::fromLatin1( "," ); - if( id == TQString::fromLatin1( "messaging/gadu" ) ) - separator = TQString::fromLatin1( "\n" ); - else if( id == TQString::fromLatin1( "messaging/icq" ) ) - separator = TQString::fromLatin1( ";" ); - else if( id == TQString::fromLatin1( "messaging/jabber" ) ) - id = TQString::fromLatin1( "messaging/xmpp" ); - - if( id == TQString::fromLatin1( "messaging/gadu" ) || id == TQString::fromLatin1( "messaging/icq" ) || - id == TQString::fromLatin1( "messaging/winpopup" ) || id == TQString::fromLatin1( "messaging/xmpp" ) ) + TQString separator = TQString::tqfromLatin1( "," ); + if( id == TQString::tqfromLatin1( "messaging/gadu" ) ) + separator = TQString::tqfromLatin1( "\n" ); + else if( id == TQString::tqfromLatin1( "messaging/icq" ) ) + separator = TQString::tqfromLatin1( ";" ); + else if( id == TQString::tqfromLatin1( "messaging/jabber" ) ) + id = TQString::tqfromLatin1( "messaging/xmpp" ); + + if( id == TQString::tqfromLatin1( "messaging/gadu" ) || id == TQString::tqfromLatin1( "messaging/icq" ) || + id == TQString::tqfromLatin1( "messaging/winpopup" ) || id == TQString::tqfromLatin1( "messaging/xmpp" ) ) { app = id; - key = TQString::fromLatin1( "All" ); - val = data.replace( separator, TQChar( 0xE000 ) ); + key = TQString::tqfromLatin1( "All" ); + val = data.tqreplace( separator, TQChar( 0xE000 ) ); } if( !app.isEmpty() ) { - TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::fromLatin1( "app" ), app ); - addressBookField.setAttribute( TQString::fromLatin1( "key" ), key ); + addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), app ); + addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), key ); addressBookField.appendChild( newList.createTextNode( val ) ); // ICQ didn't store the contactId locally, only in the address // book fields, so we need to be able to access it later - if( id == TQString::fromLatin1( "messaging/icq" ) ) + if( id == TQString::tqfromLatin1( "messaging/icq" ) ) icqData = TQStringList::split( TQChar( 0xE000 ), val ); - else if( id == TQString::fromLatin1("messaging/gadu") ) + else if( id == TQString::tqfromLatin1("messaging/gadu") ) gaduData = TQStringList::split( TQChar( 0xE000 ), val ); } } @@ -573,103 +573,103 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldContactElement = oldContactNode.toElement(); if( !oldContactElement.isNull() ) { - if( oldContactElement.tagName() == TQString::fromLatin1("display-name") ) + if( oldContactElement.tagName() == TQString::tqfromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldContactElement.text() ) ); newMetaContact.appendChild( displayName ); } - else if( oldContactElement.tagName() == TQString::fromLatin1("groups") ) + else if( oldContactElement.tagName() == TQString::tqfromLatin1("groups") ) { - TQDomElement groups = newList.createElement( TQString::fromLatin1( "groups" ) ); + TQDomElement groups = newList.createElement( TQString::tqfromLatin1( "groups" ) ); newMetaContact.appendChild( groups ); TQDomNode oldGroup = oldContactElement.firstChild(); while( !oldGroup.isNull() ) { TQDomElement oldGroupElement = oldGroup.toElement(); - if ( oldGroupElement.tagName() == TQString::fromLatin1("group") ) + if ( oldGroupElement.tagName() == TQString::tqfromLatin1("group") ) { - TQDomElement group = newList.createElement( TQString::fromLatin1( "group" ) ); + TQDomElement group = newList.createElement( TQString::tqfromLatin1( "group" ) ); group.appendChild( newList.createTextNode( oldGroupElement.text() ) ); groups.appendChild( group ); } - else if ( oldGroupElement.tagName() == TQString::fromLatin1("top-level") ) + else if ( oldGroupElement.tagName() == TQString::tqfromLatin1("top-level") ) { - TQDomElement group = newList.createElement( TQString::fromLatin1( "top-level" ) ); + TQDomElement group = newList.createElement( TQString::tqfromLatin1( "top-level" ) ); groups.appendChild( group ); } oldGroup = oldGroup.nextSibling(); } } - else if( oldContactElement.tagName() == TQString::fromLatin1( "plugin-data" ) ) + else if( oldContactElement.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) { // Convert the plugin data - TQString id = oldContactElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ); + TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); TQString data = oldContactElement.text(); bool convertOldAim = false; uint fieldCount = 1; TQString addressBookLabel; - if( id == TQString::fromLatin1("MSNProtocol") ) + if( id == TQString::tqfromLatin1("MSNProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::fromLatin1("msn"); + addressBookLabel = TQString::tqfromLatin1("msn"); } - else if( id == TQString::fromLatin1("IRCProtocol") ) + else if( id == TQString::tqfromLatin1("IRCProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::fromLatin1("irc"); + addressBookLabel = TQString::tqfromLatin1("irc"); } - else if( id == TQString::fromLatin1("OscarProtocol") ) + else if( id == TQString::tqfromLatin1("OscarProtocol") ) { fieldCount = 2; - addressBookLabel = TQString::fromLatin1("aim"); + addressBookLabel = TQString::tqfromLatin1("aim"); } - else if( id == TQString::fromLatin1("AIMProtocol") ) + else if( id == TQString::tqfromLatin1("AIMProtocol") ) { - id = TQString::fromLatin1("OscarProtocol"); + id = TQString::tqfromLatin1("OscarProtocol"); convertOldAim = true; - addressBookLabel = TQString::fromLatin1("aim"); + addressBookLabel = TQString::tqfromLatin1("aim"); } - else if( id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) + else if( id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) { fieldCount = 1; } - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) { fieldCount = 4; } - else if( id == TQString::fromLatin1("SMSProtocol") ) + else if( id == TQString::tqfromLatin1("SMSProtocol") ) { // SMS used a variable serializing using a dot as delimiter. // The minimal count is three though (id, name, delimiter). fieldCount = 2; - addressBookLabel = TQString::fromLatin1("sms"); + addressBookLabel = TQString::tqfromLatin1("sms"); } if( pluginData[ id ].isNull() ) { - pluginData[ id ] = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); - pluginData[ id ].setAttribute( TQString::fromLatin1( "plugin-id" ), id ); + pluginData[ id ] = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); + pluginData[ id ].setAttribute( TQString::tqfromLatin1( "plugin-id" ), id ); newMetaContact.appendChild( pluginData[ id ] ); } // Do the actual conversion - if( id == TQString::fromLatin1( "MSNProtocol" ) || id == TQString::fromLatin1( "OscarProtocol" ) || - id == TQString::fromLatin1( "AIMProtocol" ) || id == TQString::fromLatin1( "IRCProtocol" ) || - id == TQString::fromLatin1( "ICQProtocol" ) || id == TQString::fromLatin1( "JabberProtocol" ) || - id == TQString::fromLatin1( "SMSProtocol" ) || id == TQString::fromLatin1( "WPProtocol" ) || - id == TQString::fromLatin1( "GaduProtocol" ) ) + if( id == TQString::tqfromLatin1( "MSNProtocol" ) || id == TQString::tqfromLatin1( "OscarProtocol" ) || + id == TQString::tqfromLatin1( "AIMProtocol" ) || id == TQString::tqfromLatin1( "IRCProtocol" ) || + id == TQString::tqfromLatin1( "ICTQProtocol" ) || id == TQString::tqfromLatin1( "JabberProtocol" ) || + id == TQString::tqfromLatin1( "SMSProtocol" ) || id == TQString::tqfromLatin1( "WPProtocol" ) || + id == TQString::tqfromLatin1( "GaduProtocol" ) ) { - TQStringList strList = TQStringList::split( TQString::fromLatin1( "||" ), data ); + TQStringList strList = TQStringList::split( TQString::tqfromLatin1( "||" ), data ); // Unescape '||' for( TQStringList::iterator it = strList.begin(); it != strList.end(); ++it ) { - ( *it ).replace( TQString::fromLatin1( "\\|;" ), TQString::fromLatin1( "|" ) ). - replace( TQString::fromLatin1( "\\\\" ), TQString::fromLatin1( "\\" ) ); + ( *it ).tqreplace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). + tqreplace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); } uint idx = 0; @@ -677,65 +677,65 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement dataField; - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "contactId" ) ); - if( id == TQString::fromLatin1("ICQProtocol") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "contactId" ) ); + if( id == TQString::tqfromLatin1("ICTQProtocol") ) dataField.appendChild( newList.createTextNode( icqData[ idx ] ) ); - else if( id == TQString::fromLatin1("GaduProtocol") ) + else if( id == TQString::tqfromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( gaduData[ idx ] ) ); - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "displayName" ) ); - if( convertOldAim || id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "displayName" ) ); + if( convertOldAim || id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); - if( id == TQString::fromLatin1("MSNProtocol") ) + if( id == TQString::tqfromLatin1("MSNProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::fromLatin1("IRCProtocol") ) + else if( id == TQString::tqfromLatin1("IRCProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serverName" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serverName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "accountId" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "accountId" ) ); dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); } - else if( id == TQString::fromLatin1( "SMSProtocol" ) && - ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::fromLatin1( "." ) ) + else if( id == TQString::tqfromLatin1( "SMSProtocol" ) && + ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::tqfromLatin1( "." ) ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serviceName" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serviceName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "servicePrefs" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "servicePrefs" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); // Add extra fields @@ -744,30 +744,30 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // MSN, AIM, IRC, Oscar and SMS didn't store address book fields up // to now, so create one - if( id != TQString::fromLatin1("ICQProtocol") && id != TQString::fromLatin1("JabberProtocol") && id != TQString::fromLatin1("WPProtocol") && id != TQString::fromLatin1("GaduProtocol") ) + if( id != TQString::tqfromLatin1("ICTQProtocol") && id != TQString::tqfromLatin1("JabberProtocol") && id != TQString::tqfromLatin1("WPProtocol") && id != TQString::tqfromLatin1("GaduProtocol") ) { - TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::fromLatin1( "app" ), - TQString::fromLatin1( "messaging/" ) + addressBookLabel ); - addressBookField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "All" ) ); + addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), + TQString::tqfromLatin1( "messaging/" ) + addressBookLabel ); + addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "All" ) ); addressBookField.appendChild( newList.createTextNode( strList[ idx ] ) ); } idx += fieldCount; } } - else if( id == TQString::fromLatin1("ContactNotesPlugin") || id == TQString::fromLatin1("CryptographyPlugin") || id == TQString::fromLatin1("TranslatorPlugin") ) + else if( id == TQString::tqfromLatin1("ContactNotesPlugin") || id == TQString::tqfromLatin1("CryptographyPlugin") || id == TQString::tqfromLatin1("TranslatorPlugin") ) { - TQDomElement dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + TQDomElement dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - if( id == TQString::fromLatin1("ContactNotesPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "notes" ) ); - else if( id == TQString::fromLatin1("CryptographyPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "gpgKey" ) ); - else if( id == TQString::fromLatin1("TranslatorPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "languageKey" ) ); + if( id == TQString::tqfromLatin1("ContactNotesPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "notes" ) ); + else if( id == TQString::tqfromLatin1("CryptographyPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "gpgKey" ) ); + else if( id == TQString::tqfromLatin1("TranslatorPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "languageKey" ) ); dataField.appendChild( newList.createTextNode( data ) ); } @@ -776,9 +776,9 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers oldContactNode = oldContactNode.nextSibling(); } } - else if( oldElement.tagName() == TQString::fromLatin1("kopete-group") ) + else if( oldElement.tagName() == TQString::tqfromLatin1("kopete-group") ) { - TQDomElement newGroup = newList.createElement( TQString::fromLatin1( "kopete-group" ) ); + TQDomElement newGroup = newList.createElement( TQString::tqfromLatin1( "kopete-group" ) ); newRoot.appendChild( newGroup ); TQDomNode oldGroupNode = oldNode.firstChild(); @@ -786,38 +786,38 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement oldGroupElement = oldGroupNode.toElement(); - if( oldGroupElement.tagName() == TQString::fromLatin1("display-name") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldGroupElement.text() ) ); newGroup.appendChild( displayName ); } - if( oldGroupElement.tagName() == TQString::fromLatin1("type") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("type") ) { - if( oldGroupElement.text() == TQString::fromLatin1("Temporary") ) - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "temporary" ) ); - else if( oldGroupElement.text() == TQString::fromLatin1( "TopLevel" ) ) - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "top-level" ) ); + if( oldGroupElement.text() == TQString::tqfromLatin1("Temporary") ) + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "temporary" ) ); + else if( oldGroupElement.text() == TQString::tqfromLatin1( "TopLevel" ) ) + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "top-level" ) ); else - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); } - if( oldGroupElement.tagName() == TQString::fromLatin1("view") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("view") ) { - if( oldGroupElement.text() == TQString::fromLatin1("collapsed") ) - newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "collapsed" ) ); + if( oldGroupElement.text() == TQString::tqfromLatin1("collapsed") ) + newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "collapsed" ) ); else - newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); + newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); } - else if( oldGroupElement.tagName() == TQString::fromLatin1("plugin-data") ) + else if( oldGroupElement.tagName() == TQString::tqfromLatin1("plugin-data") ) { // Per-group plugin data // FIXME: This needs updating too, ideally, convert this in a later // contactlist.xml version - TQDomElement groupPluginData = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); + TQDomElement groupPluginData = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); newGroup.appendChild( groupPluginData ); - groupPluginData.setAttribute( TQString::fromLatin1( "plugin-id" ), - oldGroupElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ) ); + groupPluginData.setAttribute( TQString::tqfromLatin1( "plugin-id" ), + oldGroupElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ) ); groupPluginData.appendChild( newList.createTextNode( oldGroupElement.text() ) ); } @@ -836,7 +836,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // Close the file, and save the new file contactListFile.close(); - TQDir().rename( fileName, fileName + TQString::fromLatin1( ".bak" ) ); + TQDir().rename( fileName, fileName + TQString::tqfromLatin1( ".bak" ) ); // kdDebug( 14010 ) << k_funcinfo << "XML output:\n" << newList.toString( 2 ) << endl; @@ -862,7 +862,7 @@ void Kopete::ContactList::saveXML() return; } - TQString contactListFileName = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString contactListFileName = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); KSaveFile contactListFile( contactListFileName ); if( contactListFile.status() == 0 ) { @@ -894,8 +894,8 @@ void Kopete::ContactList::saveXML() const TQDomDocument ContactList::toXML() { TQDomDocument doc; - doc.appendChild( doc.createElement( TQString::fromLatin1("kopete-contact-list") ) ); - doc.documentElement().setAttribute( TQString::fromLatin1("version"), TQString::fromLatin1("1.0")); + doc.appendChild( doc.createElement( TQString::tqfromLatin1("kopete-contact-list") ) ); + doc.documentElement().setAttribute( TQString::tqfromLatin1("version"), TQString::tqfromLatin1("1.0")); // Save group information. ie: Open/Closed, pehaps later icons? Who knows. for( Kopete::Group *g = d->groups.first(); g; g = d->groups.next() ) @@ -910,7 +910,7 @@ const TQDomDocument ContactList::toXML() if( Kopete::Config::enableGlobalIdentity() ) { TQDomElement myselfElement = myself()->toXML(true); // Save minimal information. - myselfElement.setTagName( TQString::fromLatin1("myself-meta-contact") ); + myselfElement.setTagName( TQString::tqfromLatin1("myself-meta-contact") ); doc.documentElement().appendChild( doc.importNode( myselfElement, true ) ); } @@ -934,7 +934,7 @@ TQStringList ContactList::contactStatuses() const TQPtrListIterator<Kopete::MetaContact> it( d->contacts ); for( ; it.current(); ++it ) { - meta_contacts.append( TQString::fromLatin1( "%1 (%2)" ). + meta_contacts.append( TQString::tqfromLatin1( "%1 (%2)" ). arg( it.current()->displayName(), it.current()->statusString() )); } return meta_contacts; diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index ff653d34..a0b27ded 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -47,9 +47,10 @@ class Contact; * @author Martijn Klingens <klingens@kde.org> * @author Olivier Goffart <ogoffart@tiscalinet.be> */ -class KOPETE_EXPORT ContactList : public QObject +class KOPETE_EXPORT ContactList : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -131,7 +132,7 @@ public: /** * return the metacontact that represent the user itself. - * This metacontact should be the parent of every Kopete::Account::myself() contacts. + * This metacontact should be the tqparent of every Kopete::Account::myself() contacts. * * This metacontact is not in the contactlist. */ @@ -345,7 +346,7 @@ public: //TODO I think all theses method should be moved to the decop interface. * Return all meta contacts with their current status * * FIXME: Do we *need* this one? Sounds error prone to me, because - * nicknames can contain parentheses too. - Martijn + * nicknames can contain tqparentheses too. - Martijn */ TQStringList contactStatuses() const; @@ -362,12 +363,12 @@ public: //TODO I think all theses method should be moved to the decop interface. * @param fileSize (Optional) The size of the file */ void sendFile(const TQString &displayName, const KURL &sourceURL, - const TQString &altFileName = TQString::null, const long unsigned int fileSize = 0L); + const TQString &altFileName = TQString(), const long unsigned int fileSize = 0L); /** * Open a chat to a contact, and optionally set some initial text */ - void messageContact( const TQString &displayName, const TQString &messageText = TQString::null ); + void messageContact( const TQString &displayName, const TQString &messageText = TQString() ); public slots: /** diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index 5a51da80..b876c791 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -34,8 +34,8 @@ public: bool useCustomIcon; }; -ContactListElement::ContactListElement( TQObject *parent, const char *name ) -: TQObject( parent, name ) +ContactListElement::ContactListElement( TQObject *tqparent, const char *name ) +: TQObject( tqparent, name ) { d = new Private; @@ -72,7 +72,7 @@ void ContactListElement::setPluginData( Plugin *p, const TQString &key, const TQ TQMap<TQString, TQString> ContactListElement::pluginData( Plugin *plugin ) const { - if ( !d->pluginData.contains( plugin->pluginId() ) ) + if ( !d->pluginData.tqcontains( plugin->pluginId() ) ) return TQMap<TQString, TQString>(); return d->pluginData[ plugin->pluginId() ]; @@ -80,8 +80,8 @@ TQMap<TQString, TQString> ContactListElement::pluginData( Plugin *plugin ) const TQString ContactListElement::pluginData( Plugin *plugin, const TQString &key ) const { - if ( !d->pluginData.contains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].contains( key ) ) - return TQString::null; + if ( !d->pluginData.tqcontains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].tqcontains( key ) ) + return TQString(); return d->pluginData[ plugin->pluginId() ][ key ]; } @@ -90,21 +90,21 @@ const TQValueList<TQDomElement> ContactListElement::toXML() { TQDomDocument pluginData; TQValueList<TQDomElement> pluginNodes; - pluginData.appendChild( pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ) ); + pluginData.appendChild( pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ) ); if ( !d->pluginData.isEmpty() ) { TQMap<TQString, TQMap<TQString, TQString> >::ConstIterator pluginIt; for ( pluginIt = d->pluginData.begin(); pluginIt != d->pluginData.end(); ++pluginIt ) { - TQDomElement pluginElement = pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ); - pluginElement.setAttribute( TQString::fromLatin1( "plugin-id" ), pluginIt.key() ); + TQDomElement pluginElement = pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ); + pluginElement.setAttribute( TQString::tqfromLatin1( "plugin-id" ), pluginIt.key() ); TQMap<TQString, TQString>::ConstIterator it; for ( it = pluginIt.data().begin(); it != pluginIt.data().end(); ++it ) { - TQDomElement pluginDataField = pluginData.createElement( TQString::fromLatin1( "plugin-data-field" ) ); - pluginDataField.setAttribute( TQString::fromLatin1( "key" ), it.key() ); + TQDomElement pluginDataField = pluginData.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + pluginDataField.setAttribute( TQString::tqfromLatin1( "key" ), it.key() ); pluginDataField.appendChild( pluginData.createTextNode( it.data() ) ); pluginElement.appendChild( pluginDataField ); } @@ -115,39 +115,39 @@ const TQValueList<TQDomElement> ContactListElement::toXML() } if ( !d->icons.isEmpty() ) { - TQDomElement iconsElement = pluginData.createElement( TQString::fromLatin1( "custom-icons" ) ); - iconsElement.setAttribute( TQString::fromLatin1( "use" ), d->useCustomIcon ? TQString::fromLatin1( "1" ) : TQString::fromLatin1( "0" ) ); + TQDomElement iconsElement = pluginData.createElement( TQString::tqfromLatin1( "custom-icons" ) ); + iconsElement.setAttribute( TQString::tqfromLatin1( "use" ), d->useCustomIcon ? TQString::tqfromLatin1( "1" ) : TQString::tqfromLatin1( "0" ) ); for ( TQMap<IconState, TQString >::ConstIterator it = d->icons.begin(); it != d->icons.end(); ++it ) { - TQDomElement iconElement = pluginData.createElement( TQString::fromLatin1( "icon" ) ); + TQDomElement iconElement = pluginData.createElement( TQString::tqfromLatin1( "icon" ) ); TQString stateStr; switch ( it.key() ) { case Open: - stateStr = TQString::fromLatin1( "open" ); + stateStr = TQString::tqfromLatin1( "open" ); break; case Closed: - stateStr = TQString::fromLatin1( "closed" ); + stateStr = TQString::tqfromLatin1( "closed" ); break; case Online: - stateStr = TQString::fromLatin1( "online" ); + stateStr = TQString::tqfromLatin1( "online" ); break; case Away: - stateStr = TQString::fromLatin1( "away" ); + stateStr = TQString::tqfromLatin1( "away" ); break; case Offline: - stateStr = TQString::fromLatin1( "offline" ); + stateStr = TQString::tqfromLatin1( "offline" ); break; case Unknown: - stateStr = TQString::fromLatin1( "unknown" ); + stateStr = TQString::tqfromLatin1( "unknown" ); break; case None: default: - stateStr = TQString::fromLatin1( "none" ); + stateStr = TQString::tqfromLatin1( "none" ); break; } - iconElement.setAttribute( TQString::fromLatin1( "state" ), stateStr ); + iconElement.setAttribute( TQString::tqfromLatin1( "state" ), stateStr ); iconElement.appendChild( pluginData.createTextNode( it.data() ) ); iconsElement.appendChild( iconElement ); } @@ -159,52 +159,52 @@ const TQValueList<TQDomElement> ContactListElement::toXML() bool ContactListElement::fromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::fromLatin1( "plugin-data" ) ) + if ( element.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) { TQMap<TQString, TQString> pluginData; - TQString pluginId = element.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ); + TQString pluginId = element.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); //in kopete 0.6 the AIM protocol was called OSCAR - if ( pluginId == TQString::fromLatin1( "OscarProtocol" ) ) - pluginId = TQString::fromLatin1( "AIMProtocol" ); + if ( pluginId == TQString::tqfromLatin1( "OscarProtocol" ) ) + pluginId = TQString::tqfromLatin1( "AIMProtocol" ); TQDomNode field = element.firstChild(); while( !field.isNull() ) { TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) + if ( fieldElement.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) ) { - pluginData.insert( fieldElement.attribute( TQString::fromLatin1( "key" ), - TQString::fromLatin1( "undefined-key" ) ), fieldElement.text() ); + pluginData.insert( fieldElement.attribute( TQString::tqfromLatin1( "key" ), + TQString::tqfromLatin1( "undefined-key" ) ), fieldElement.text() ); } field = field.nextSibling(); } d->pluginData.insert( pluginId, pluginData ); } - else if ( element.tagName() == TQString::fromLatin1( "custom-icons" ) ) + else if ( element.tagName() == TQString::tqfromLatin1( "custom-icons" ) ) { - d->useCustomIcon= element.attribute( TQString::fromLatin1( "use" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ); + d->useCustomIcon= element.attribute( TQString::tqfromLatin1( "use" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ); TQDomNode ic = element.firstChild(); while( !ic.isNull() ) { TQDomElement iconElement = ic.toElement(); - if ( iconElement.tagName() == TQString::fromLatin1( "icon" ) ) + if ( iconElement.tagName() == TQString::tqfromLatin1( "icon" ) ) { - TQString stateStr = iconElement.attribute( TQString::fromLatin1( "state" ), TQString::null ); + TQString stateStr = iconElement.attribute( TQString::tqfromLatin1( "state" ), TQString() ); TQString icon = iconElement.text(); IconState state = None; - if ( stateStr == TQString::fromLatin1( "open" ) ) + if ( stateStr == TQString::tqfromLatin1( "open" ) ) state = Open; - if ( stateStr == TQString::fromLatin1( "closed" ) ) + if ( stateStr == TQString::tqfromLatin1( "closed" ) ) state = Closed; - if ( stateStr == TQString::fromLatin1( "online" ) ) + if ( stateStr == TQString::tqfromLatin1( "online" ) ) state = Online; - if ( stateStr == TQString::fromLatin1( "offline" ) ) + if ( stateStr == TQString::tqfromLatin1( "offline" ) ) state = Offline; - if ( stateStr == TQString::fromLatin1( "away" ) ) + if ( stateStr == TQString::tqfromLatin1( "away" ) ) state = Away; - if ( stateStr == TQString::fromLatin1( "unknown" ) ) + if ( stateStr == TQString::tqfromLatin1( "unknown" ) ) state = Unknown; d->icons[ state ] = icon; @@ -222,7 +222,7 @@ bool ContactListElement::fromXML( const TQDomElement& element ) TQString ContactListElement::icon( ContactListElement::IconState state ) const { - if ( d->icons.contains( state ) ) + if ( d->icons.tqcontains( state ) ) return d->icons[state]; return d->icons[ None ]; diff --git a/kopete/libkopete/kopetecontactlistelement.h b/kopete/libkopete/kopetecontactlistelement.h index 6e9d1816..808b36b2 100644 --- a/kopete/libkopete/kopetecontactlistelement.h +++ b/kopete/libkopete/kopetecontactlistelement.h @@ -44,9 +44,10 @@ class Plugin; class KOPETE_EXPORT ContactListElement : public TQObject /* public KopeteNotifyDataObject */ { Q_OBJECT + TQ_OBJECT protected: - ContactListElement( TQObject *parent = 0L, const char *name = 0L ); + ContactListElement( TQObject *tqparent = 0L, const char *name = 0L ); ~ContactListElement(); @@ -109,7 +110,7 @@ public: /** * Set the icon in the given state - * To clear an entry, set a TQString::null + * To clear an entry, set a TQString() */ void setIcon( const TQString &icon, IconState = None ); diff --git a/kopete/libkopete/kopetecontactproperty.h b/kopete/libkopete/kopetecontactproperty.h index f7213faa..92d60c49 100644 --- a/kopete/libkopete/kopetecontactproperty.h +++ b/kopete/libkopete/kopetecontactproperty.h @@ -58,7 +58,7 @@ class KOPETE_EXPORT ContactPropertyTmpl **/ ContactPropertyTmpl( const TQString &key, const TQString &label, - const TQString &icon = TQString::null, + const TQString &icon = TQString(), bool persistent = false, bool richText = false, bool privateProp = false ); @@ -119,7 +119,7 @@ class KOPETE_EXPORT ContactPropertyTmpl bool isNull() const; /** - * A Map of TQString and ContactPropertyTmpl objects, based on QMap + * A Map of TQString and ContactPropertyTmpl objects, based on TQMap **/ typedef TQMap<TQString, ContactPropertyTmpl> Map; diff --git a/kopete/libkopete/kopeteeventpresentation.cpp b/kopete/libkopete/kopeteeventpresentation.cpp index 659b1b41..9314df14 100644 --- a/kopete/libkopete/kopeteeventpresentation.cpp +++ b/kopete/libkopete/kopeteeventpresentation.cpp @@ -76,15 +76,15 @@ TQString Kopete::EventPresentation::toString() switch ( m_type ) { case Sound: - type= TQString::fromLatin1("sound"); + type= TQString::tqfromLatin1("sound"); break; case Message: - type= TQString::fromLatin1("message"); + type= TQString::tqfromLatin1("message"); break; case Chat: - type= TQString::fromLatin1("chat"); + type= TQString::tqfromLatin1("chat"); break; } - TQString stringRep = TQString::fromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).arg(type).arg(m_content).arg(m_enabled).arg(m_singleShot); + TQString stringRep = TQString::tqfromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).tqarg(type).tqarg(m_content).tqarg(m_enabled).tqarg(m_singleShot); return stringRep; } diff --git a/kopete/libkopete/kopeteeventpresentation.h b/kopete/libkopete/kopeteeventpresentation.h index 0576a9b1..07ea1213 100644 --- a/kopete/libkopete/kopeteeventpresentation.h +++ b/kopete/libkopete/kopeteeventpresentation.h @@ -31,7 +31,7 @@ public: enum PresentationType { Sound, Message, Chat }; EventPresentation( const PresentationType type ); EventPresentation( const PresentationType type, - const TQString &content = TQString::null, + const TQString &content = TQString(), const bool singleShot = false, const bool enabled = false ); ~EventPresentation(); diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 093be4df..2dae6117 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -69,7 +69,7 @@ Properties::~Properties() const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { /*kdDebug(14000) << k_funcinfo << "Found template for key = '" << key << "'" << endl;*/ @@ -82,7 +82,7 @@ const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const bool Properties::registerTemplate(const TQString &key, const ContactPropertyTmpl &tmpl) { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { kdDebug(14000) << k_funcinfo << "Called for EXISTING key = '" << key << "'" << endl; @@ -103,91 +103,91 @@ void Properties::unregisterTemplate(const TQString &key) bool Properties::isRegistered(const TQString &key) { - return d->mTemplates.contains(key); + return d->mTemplates.tqcontains(key); } const ContactPropertyTmpl &Properties::fullName() const { - return createProp(TQString::fromLatin1("FormattedName"), + return createProp(TQString::tqfromLatin1("FormattedName"), i18n("Full Name")); } const ContactPropertyTmpl &Properties::idleTime() const { - return createProp(TQString::fromLatin1("idleTime"), + return createProp(TQString::tqfromLatin1("idleTime"), i18n("Idle Time")); } const ContactPropertyTmpl &Properties::onlineSince() const { - return createProp(TQString::fromLatin1("onlineSince"), + return createProp(TQString::tqfromLatin1("onlineSince"), i18n("Online Since")); } const ContactPropertyTmpl &Properties::lastSeen() const { - return createProp(TQString::fromLatin1("lastSeen"), - i18n("Last Seen"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastSeen"), + i18n("Last Seen"), TQString(), true); } const ContactPropertyTmpl &Properties::awayMessage() const { - return createProp(TQString::fromLatin1("awayMessage"), + return createProp(TQString::tqfromLatin1("awayMessage"), i18n("Away Message")); } const ContactPropertyTmpl &Properties::firstName() const { - return createProp(TQString::fromLatin1("firstName"), - i18n("First Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("firstName"), + i18n("First Name"), TQString(), true); } const ContactPropertyTmpl &Properties::lastName() const { - return createProp(TQString::fromLatin1("lastName"), - i18n("Last Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastName"), + i18n("Last Name"), TQString(), true); } const ContactPropertyTmpl &Properties::privatePhone() const { - return createProp(TQString::fromLatin1("privatePhoneNumber"), - i18n("Private Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privatePhoneNumber"), + i18n("Private Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::privateMobilePhone() const { - return createProp(TQString::fromLatin1("privateMobilePhoneNumber"), - i18n("Private Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privateMobilePhoneNumber"), + i18n("Private Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workPhone() const { - return createProp(TQString::fromLatin1("workPhoneNumber"), - i18n("Work Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workPhoneNumber"), + i18n("Work Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workMobilePhone() const { - return createProp(TQString::fromLatin1("workMobilePhoneNumber"), - i18n("Work Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workMobilePhoneNumber"), + i18n("Work Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::emailAddress() const { - return createProp(TQString::fromLatin1("emailAddress"), - i18n("Email Address"), TQString::fromLatin1("mail_generic"), true); + return createProp(TQString::tqfromLatin1("emailAddress"), + i18n("Email Address"), TQString::tqfromLatin1("mail_generic"), true); } const ContactPropertyTmpl &Properties::nickName() const { - return createProp(TQString::fromLatin1("nickName"), - i18n("Nick Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("nickName"), + i18n("Nick Name"), TQString(), true); } const ContactPropertyTmpl &Properties::photo() const { - return createProp(TQString::fromLatin1("photo"), - i18n("Photo"), TQString::null, true); + return createProp(TQString::tqfromLatin1("photo"), + i18n("Photo"), TQString(), true); } @@ -197,7 +197,7 @@ const ContactPropertyTmpl &Properties::createProp(const TQString &key, /*kdDebug(14000) << k_funcinfo << "key = " << key << ", label = " << label << endl;*/ - if(!d->mTemplates.contains(key)) + if(!d->mTemplates.tqcontains(key)) { /* kdDebug(14000) << k_funcinfo << "CREATING NEW ContactPropertyTmpl WITH key = " << key << @@ -224,7 +224,7 @@ void installEmoticonTheme(const TQString &archiveName) KProgressDialog *progressDlg = 0L; KArchive *archive = 0L; - TQString localThemesDir(locateLocal("emoticons", TQString::null) ); + TQString localThemesDir(locateLocal("emoticons", TQString()) ); if(localThemesDir.isEmpty()) { @@ -235,20 +235,20 @@ void installEmoticonTheme(const TQString &archiveName) } progressDlg = new KProgressDialog(0 , "emoticonInstProgress", - i18n("Installing Emoticon Themes..."), TQString::null, true); + i18n("Installing Emoticon Themes..."), TQString(), true); progressDlg->progressBar()->setTotalSteps(foundThemes.count()); progressDlg->show(); kapp->processEvents(); TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name(); - if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") ) + if( currentBundleMimeType == TQString::tqfromLatin1("application/x-zip") ) archive = new KZip(archiveName); - else if( currentBundleMimeType == TQString::fromLatin1("application/x-tgz") || - currentBundleMimeType == TQString::fromLatin1("application/x-tbz") || - currentBundleMimeType == TQString::fromLatin1("application/x-gzip") || - currentBundleMimeType == TQString::fromLatin1("application/x-bzip2") ) + else if( currentBundleMimeType == TQString::tqfromLatin1("application/x-tgz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-tbz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-gzip") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-bzip2") ) archive = new KTar(archiveName); - else if(archiveName.endsWith(TQString::fromLatin1("jisp")) || archiveName.endsWith(TQString::fromLatin1("zip")) ) + else if(archiveName.endsWith(TQString::tqfromLatin1("jisp")) || archiveName.endsWith(TQString::tqfromLatin1("zip")) ) archive = new KZip(archiveName); else archive = new KTar(archiveName); @@ -257,7 +257,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Could not open \"%1\" for unpacking.").arg(archiveName)); + i18n("Could not open \"%1\" for unpacking.").tqarg(archiveName)); delete archive; delete progressDlg; return; @@ -273,8 +273,8 @@ void installEmoticonTheme(const TQString &archiveName) if (currentEntry->isDirectory()) { currentDir = dynamic_cast<KArchiveDirectory*>( currentEntry ); - if (currentDir && ( currentDir->entry(TQString::fromLatin1("emoticons.xml")) != NULL || - currentDir->entry(TQString::fromLatin1("icondef.xml")) != NULL ) ) + if (currentDir && ( currentDir->entry(TQString::tqfromLatin1("emoticons.xml")) != NULL || + currentDir->entry(TQString::tqfromLatin1("icondef.xml")) != NULL ) ) foundThemes.append(currentDir->name()); } } @@ -283,7 +283,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("<qt>The file \"%1\" is not a valid" \ - " emoticon theme archive.</qt>").arg(archiveName)); + " emoticon theme archive.</qt>").tqarg(archiveName)); archive->close(); delete archive; delete progressDlg; @@ -294,8 +294,8 @@ void installEmoticonTheme(const TQString &archiveName) { progressDlg->setLabel( i18n("<qt>Installing <strong>%1</strong> emoticon theme</qt>") - .arg(*it)); - progressDlg->resize(progressDlg->sizeHint()); + .tqarg(*it)); + progressDlg->resize(progressDlg->tqsizeHint()); kapp->processEvents(); if (progressDlg->wasCancelled()) diff --git a/kopete/libkopete/kopeteglobal.h b/kopete/libkopete/kopeteglobal.h index 395d0eae..7ecc6f5b 100644 --- a/kopete/libkopete/kopeteglobal.h +++ b/kopete/libkopete/kopeteglobal.h @@ -160,7 +160,7 @@ namespace Global void unregisterTemplate(const TQString &key); const ContactPropertyTmpl &createProp(const TQString &key, - const TQString &label, const TQString &icon=TQString::null, + const TQString &label, const TQString &icon=TQString(), bool persistent = false) const; private: diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index 6206545a..ac221223 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -93,7 +93,7 @@ TQPtrList<MetaContact> Group::members() const // members is a *copy* of the meta contacts, so using first(), next() and remove() is fine. for( members.first(); members.current(); ) { - if ( members.current()->groups().contains( this ) ) + if ( members.current()->groups().tqcontains( this ) ) members.next(); else members.remove(); @@ -104,27 +104,27 @@ TQPtrList<MetaContact> Group::members() const const TQDomElement Group::toXML() { TQDomDocument group; - group.appendChild( group.createElement( TQString::fromLatin1( "kopete-group" ) ) ); - group.documentElement().setAttribute( TQString::fromLatin1( "groupId" ), TQString::number( groupId() ) ); + group.appendChild( group.createElement( TQString::tqfromLatin1( "kopete-group" ) ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "groupId" ), TQString::number( groupId() ) ); TQString type; switch ( d->type ) { case Temporary: - type = TQString::fromLatin1( "temporary" ); + type = TQString::tqfromLatin1( "temporary" ); break; case TopLevel: - type = TQString::fromLatin1( "top-level" ); + type = TQString::tqfromLatin1( "top-level" ); break; default: - type = TQString::fromLatin1( "standard" ); // == Normal + type = TQString::tqfromLatin1( "standard" ); // == Normal break; } - group.documentElement().setAttribute( TQString::fromLatin1( "type" ), type ); - group.documentElement().setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( d->expanded ? "expanded" : "collapsed" ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "type" ), type ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( d->expanded ? "expanded" : "collapsed" ) ); - TQDomElement displayName = group.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = group.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( group.createTextNode( d->displayName ) ); group.documentElement().appendChild( displayName ); @@ -143,7 +143,7 @@ const TQDomElement Group::toXML() bool Group::fromXML( const TQDomElement &data ) { - TQString strGroupId = data.attribute( TQString::fromLatin1( "groupId" ) ); + TQString strGroupId = data.attribute( TQString::tqfromLatin1( "groupId" ) ); if ( !strGroupId.isEmpty() ) { d->groupId = strGroupId.toUInt(); @@ -154,8 +154,8 @@ bool Group::fromXML( const TQDomElement &data ) // Don't overwrite type for Temporary and TopLevel groups if ( d->type != Temporary && d->type != TopLevel ) { - TQString type = data.attribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); - if ( type == TQString::fromLatin1( "temporary" ) ) + TQString type = data.attribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); + if ( type == TQString::tqfromLatin1( "temporary" ) ) { if ( d->type != Temporary ) { @@ -163,7 +163,7 @@ bool Group::fromXML( const TQDomElement &data ) return false; } } - else if ( type == TQString::fromLatin1( "top-level" ) ) + else if ( type == TQString::tqfromLatin1( "top-level" ) ) { if ( d->type != TopLevel ) { @@ -177,20 +177,20 @@ bool Group::fromXML( const TQDomElement &data ) } } - TQString view = data.attribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); - d->expanded = ( view != TQString::fromLatin1( "collapsed" ) ); + TQString view = data.attribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); + d->expanded = ( view != TQString::tqfromLatin1( "collapsed" ) ); TQDomNode groupData = data.firstChild(); while ( !groupData.isNull() ) { TQDomElement groupElement = groupData.toElement(); - if ( groupElement.tagName() == TQString::fromLatin1( "display-name" ) ) + if ( groupElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) { // Don't set display name for temporary or top-level items if ( d->type == Normal ) d->displayName = groupElement.text(); } - else if( groupElement.tagName() == TQString::fromLatin1( "custom-notifications" ) ) + else if( groupElement.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) { Kopete::NotifyDataObject::notifyDataFromXML( groupElement ); } @@ -208,10 +208,10 @@ bool Group::fromXML( const TQDomElement &data ) switch ( d->type ) { case Temporary: - d->displayName = TQString::fromLatin1( "Temporary" ); + d->displayName = TQString::tqfromLatin1( "Temporary" ); break; case TopLevel: - d->displayName = TQString::fromLatin1( "Top-Level" ); + d->displayName = TQString::tqfromLatin1( "Top-Level" ); break; default: d->displayName = i18n( "(Unnamed Group)" ); diff --git a/kopete/libkopete/kopetegroup.h b/kopete/libkopete/kopetegroup.h index af1f828a..3f430eda 100644 --- a/kopete/libkopete/kopetegroup.h +++ b/kopete/libkopete/kopetegroup.h @@ -46,11 +46,12 @@ class Message; */ class KOPETE_EXPORT Group : public ContactListElement, public NotifyDataObject { - Q_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) - Q_PROPERTY( uint groupId READ groupId ) - Q_PROPERTY( bool expanded READ isExpanded WRITE setExpanded ) + TQ_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) + TQ_PROPERTY( uint groupId READ groupId ) + TQ_PROPERTY( bool expanded READ isExpanded WRITE setExpanded ) Q_OBJECT + TQ_OBJECT public: /** Kinds of groups. */ diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index 6f223748..db3b24ef 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -78,19 +78,19 @@ Message::Private::Private( const TQDateTime &timeStamp, const Contact *from, : from( from ), to( to ), manager( 0 ), direction( direction ), format( PlainText ), type( type ), requestedPlugin( requestedPlugin ), importance( (to.count() <= 1) ? Normal : Low ), bgOverride( false ), fgOverride( false ), rtfOverride( false ), isRightToLeft( false ), - timeStamp( timeStamp ), body( TQString::null ), subject( subject ) + timeStamp( timeStamp ), body( TQString() ), subject( subject ) { } Message::Message() -: d( new Private( TQDateTime::currentDateTime(), 0L, TQPtrList<Contact>(), TQString::null, Internal, - TQString::null, TypeNormal ) ) +: d( new Private( TQDateTime::tqcurrentDateTime(), 0L, TQPtrList<Contact>(), TQString(), Internal, + TQString(), TypeNormal ) ) { } Message::Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) -: d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, TQString::null, direction, requestedPlugin, type ) ) +: d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -100,20 +100,20 @@ Message::Message( const Contact *fromKC, const Contact *toKC, const TQString &bo { TQPtrList<Contact> to; to.append(toKC); - d = new Private( TQDateTime::currentDateTime(), fromKC, to, TQString::null, direction, requestedPlugin, type ); + d = new Private( TQDateTime::tqcurrentDateTime(), fromKC, to, TQString(), direction, requestedPlugin, type ); doSetBody( body, f ); } Message::Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, const TQString &subject, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) - : d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) + : d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) { doSetBody( body, f ); } Message::Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) - : d( new Private( timeStamp, fromKC, toKC, TQString::null, direction, requestedPlugin, type ) ) + : d( new Private( timeStamp, fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -199,20 +199,20 @@ void Message::doSetBody( const TQString &_body, Message::MessageFormat f ) { //This is coming from the RichTextEditor component. //Strip off the containing HTML document - body.replace( TQRegExp( TQString::fromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::fromLatin1("\\1") ); + body.tqreplace( TQRegExp( TQString::tqfromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::tqfromLatin1("\\1") ); //Strip <p> tags - body.replace( TQString::fromLatin1("<p>"), TQString::null ); + body.tqreplace( TQString::tqfromLatin1("<p>"), TQString() ); //Replace </p> with a <br/> - body.replace( TQString::fromLatin1("</p>"), TQString::fromLatin1("<br/>") ); + body.tqreplace( TQString::tqfromLatin1("</p>"), TQString::tqfromLatin1("<br/>") ); //Remove trailing </br> - if ( body.endsWith( TQString::fromLatin1("<br/>") ) ) + if ( body.endsWith( TQString::tqfromLatin1("<br/>") ) ) body.truncate( body.length() - 5 ); - body.remove( TQString::fromLatin1("\n") ); - body.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); + body.remove( TQString::tqfromLatin1("\n") ); + body.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); } /* else if( f == ParsedHTML ) @@ -255,23 +255,23 @@ TQString Message::unescape( const TQString &xml ) data.simplifyWhiteSpace(); int pos; - while ( ( pos = data.find( '<' ) ) != -1 ) + while ( ( pos = data.tqfind( '<' ) ) != -1 ) { - int endPos = data.find( '>', pos + 1 ); + int endPos = data.tqfind( '>', pos + 1 ); if( endPos == -1 ) break; // No more complete elements left // Take the part between < and >, and extract the element name from that int matchWidth = endPos - pos + 1; TQString match = data.mid( pos + 1, matchWidth - 2 ).simplifyWhiteSpace(); - int elemEndPos = match.find( ' ' ); + int elemEndPos = match.tqfind( ' ' ); TQString elem = ( elemEndPos == -1 ? match.lower() : match.left( elemEndPos ).lower() ); - if ( elem == TQString::fromLatin1( "img" ) ) + if ( elem == TQString::tqfromLatin1( "img" ) ) { // Replace smileys with their original text' - const TQString attrTitle = TQString::fromLatin1( "title=\"" ); - int titlePos = match.find( attrTitle, elemEndPos ); - int titleEndPos = match.find( '"', titlePos + attrTitle.length() ); + const TQString attrTitle = TQString::tqfromLatin1( "title=\"" ); + int titlePos = match.tqfind( attrTitle, elemEndPos ); + int titleEndPos = match.tqfind( '"', titlePos + attrTitle.length() ); if( titlePos == -1 || titleEndPos == -1 ) { // Not a smiley but a normal <img> @@ -282,15 +282,15 @@ TQString Message::unescape( const TQString &xml ) { TQString orig = match.mid( titlePos + attrTitle.length(), titleEndPos - titlePos - attrTitle.length() ); - data.replace( pos, matchWidth, orig ); + data.tqreplace( pos, matchWidth, orig ); pos += orig.length(); } } - else if ( elem == TQString::fromLatin1( "/p" ) || elem == TQString::fromLatin1( "/div" ) || - elem == TQString::fromLatin1( "br" ) ) + else if ( elem == TQString::tqfromLatin1( "/p" ) || elem == TQString::tqfromLatin1( "/div" ) || + elem == TQString::tqfromLatin1( "br" ) ) { // Replace paragraph, div and line breaks with a newline - data.replace( pos, matchWidth, '\n' ); + data.tqreplace( pos, matchWidth, '\n' ); pos++; } else @@ -302,12 +302,12 @@ TQString Message::unescape( const TQString &xml ) } // Replace stuff starting with '&' - data.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); - data.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); - data.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); - data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); - data.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); - data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; + data.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + data.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + data.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + data.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; return data; } @@ -316,13 +316,13 @@ TQString Message::escape( const TQString &text ) { TQString html = TQStyleSheet::escape( text ); //Replace carriage returns inside the text - html.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br />" ) ); + html.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br />" ) ); //Replace a tab with 4 spaces - html.replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( " " ) ); + html.tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ); //Replace multiple spaces with //do not replace every space so we break the linebreak - html.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); + html.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); return html; } @@ -373,11 +373,11 @@ TQString Message::parsedBody() const static TQString makeRegExp( const char *pattern ) { - const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).arg( urlChar ); - const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).arg( urlChar ); + const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString boundaryStart = TQString::tqfromLatin1( "(^|[^%1])(" ).tqarg( urlChar ); + const TQString boundaryEnd = TQString::tqfromLatin1( ")([^%1]|$)" ).tqarg( urlChar ); - return boundaryStart + TQString::fromLatin1(pattern) + boundaryEnd; + return boundaryStart + TQString::tqfromLatin1(pattern) + boundaryEnd; } TQString Message::parseLinks( const TQString &message, MessageFormat format ) @@ -403,7 +403,7 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) { TQString curr = *it; // > in HTML means start-of-tag if and only if it's the first one after a < - int tagclose = curr.find( TQChar('>') ); + int tagclose = curr.tqfind( TQChar('>') ); // no >: the HTML is broken, but we can cope if ( tagclose == -1 ) continue; @@ -411,38 +411,38 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) TQString body = curr.mid( tagclose + 1 ); *it = tag + parseLinks( body, PlainText ); } - return entries.join(TQString::fromLatin1("<")); + return entries.join(TQString::tqfromLatin1("<")); } TQString result = message; // common subpatterns - may not contain matching parens! - const TQString name = TQString::fromLatin1( "[\\w\\+\\-=_\\.]+" ); - const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).arg( name ); - const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString urlSection = TQString::fromLatin1( "[%1]+" ).arg( urlChar ); - const TQString domain = TQString::fromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); + const TQString name = TQString::tqfromLatin1( "[\\w\\+\\-=_\\.]+" ); + const TQString userAndPassword = TQString::tqfromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name ); + const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString urlSection = TQString::tqfromLatin1( "[%1]+" ).tqarg( urlChar ); + const TQString domain = TQString::tqfromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link - result.replace( - TQRegExp( makeRegExp("\\w+://%1?\\w%2").arg( userAndPassword, urlSection ) ), - TQString::fromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); + result.tqreplace( + TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), + TQString::tqfromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link - result.replace( - TQRegExp( makeRegExp("%1?www\\.%2%3").arg( userAndPassword, domain, urlSection ) ), - TQString::fromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); + result.tqreplace( + TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), + TQString::tqfromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link - result.replace( - TQRegExp( makeRegExp("%1@%2").arg( name, domain ) ), - TQString::fromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); + result.tqreplace( + TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), + TQString::tqfromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself // the trailing is included in the url. - result.replace( TQRegExp( TQString::fromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::fromLatin1("\\1\\3") ); + result.tqreplace( TQRegExp( TQString::tqfromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::tqfromLatin1("\\1\\3") ); return result; } @@ -486,8 +486,8 @@ TQColor Message::bg() const TQFont Message::font() const { - //TQDomElement bodyNode = d->xmlDoc.elementsByTagName( TQString::fromLatin1("body") ).item(0).toElement(); - //return TQFont( bodyNode.attribute( TQString::fromLatin1("font") ), bodyNode.attribute( TQString::fromLatin1("fontsize") ).toInt() ); + //TQDomElement bodyNode = d->xmlDoc.elementsByTagName( TQString::tqfromLatin1("body") ).item(0).toElement(); + //return TQFont( bodyNode.attribute( TQString::tqfromLatin1("font") ), bodyNode.attribute( TQString::tqfromLatin1("fontsize") ).toInt() ); return d->font; } @@ -531,11 +531,11 @@ TQString Message::getHtmlStyleAttribute() const // Affect foreground(color) and background color to message. if( !d->fgOverride && d->fgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("color: %1; ").arg(d->fgColor.name()); + styleAttribute += TQString::fromUtf8("color: %1; ").tqarg(d->fgColor.name()); } if( !d->bgOverride && d->bgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("background-color: %1; ").arg(d->bgColor.name()); + styleAttribute += TQString::fromUtf8("background-color: %1; ").tqarg(d->bgColor.name()); } // Affect font parameters. @@ -543,15 +543,15 @@ TQString Message::getHtmlStyleAttribute() const { TQString fontstr; if(!d->font.family().isNull()) - fontstr+=TQString::fromLatin1("font-family: ")+d->font.family()+TQString::fromLatin1("; "); + fontstr+=TQString::tqfromLatin1("font-family: ")+d->font.family()+TQString::tqfromLatin1("; "); if(d->font.italic()) - fontstr+=TQString::fromLatin1("font-style: italic; "); + fontstr+=TQString::tqfromLatin1("font-style: italic; "); if(d->font.strikeOut()) - fontstr+=TQString::fromLatin1("text-decoration: line-through; "); + fontstr+=TQString::tqfromLatin1("text-decoration: line-through; "); if(d->font.underline()) - fontstr+=TQString::fromLatin1("text-decoration: underline; "); + fontstr+=TQString::tqfromLatin1("text-decoration: underline; "); if(d->font.bold()) - fontstr+=TQString::fromLatin1("font-weight: bold;"); + fontstr+=TQString::tqfromLatin1("font-weight: bold;"); styleAttribute += fontstr; } @@ -629,7 +629,7 @@ TQString Message::decodeString( const TQCString &message, const TQTextCodec *pro kdDebug(14000) << k_funcinfo << "Using latin1 and cleaning string" << endl; //No codec decoded. Just decode latin1, and clean out any junk. - TQString result = TQString::fromLatin1( message ); + TQString result = TQString::tqfromLatin1( message ); const uint length = message.length(); for( uint i = 0; i < length; ++i ) { diff --git a/kopete/libkopete/kopetemessage.h b/kopete/libkopete/kopetemessage.h index df546c38..366a0204 100644 --- a/kopete/libkopete/kopetemessage.h +++ b/kopete/libkopete/kopetemessage.h @@ -119,7 +119,7 @@ public: */ Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -133,7 +133,7 @@ public: */ Message( const Contact *fromKC, const Contact *toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -148,7 +148,7 @@ public: */ Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, const TQString &subject, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -163,7 +163,7 @@ public: */ Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -179,7 +179,7 @@ public: */ Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, const TQString &subject, MessageDirection direction, - MessageFormat format = PlainText, const TQString &requestedPlugin = TQString::null, + MessageFormat format = PlainText, const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** diff --git a/kopete/libkopete/kopetemessageevent.cpp b/kopete/libkopete/kopetemessageevent.cpp index d50c85e9..09e61605 100644 --- a/kopete/libkopete/kopetemessageevent.cpp +++ b/kopete/libkopete/kopetemessageevent.cpp @@ -37,8 +37,8 @@ public: EventState state; }; -MessageEvent::MessageEvent( const Message& m, TQObject *parent, const char *name ) - : TQObject(parent,name), d( new Private ) +MessageEvent::MessageEvent( const Message& m, TQObject *tqparent, const char *name ) + : TQObject(tqparent,name), d( new Private ) { d->message = m; d->state = Nothing; diff --git a/kopete/libkopete/kopetemessageevent.h b/kopete/libkopete/kopetemessageevent.h index 9cfa1ea5..daf38e04 100644 --- a/kopete/libkopete/kopetemessageevent.h +++ b/kopete/libkopete/kopetemessageevent.h @@ -39,12 +39,13 @@ namespace Kopete * the message, and a signal when it is terminated (i.e. * the message is read **/ -class KOPETE_EXPORT MessageEvent : public QObject +class KOPETE_EXPORT MessageEvent : public TQObject { Q_OBJECT + TQ_OBJECT public: - MessageEvent(const Kopete::Message& , TQObject* parent=0L, const char *name=0L); + MessageEvent(const Kopete::Message& , TQObject* tqparent=0L, const char *name=0L); ~MessageEvent(); /** diff --git a/kopete/libkopete/kopetemessagehandler.h b/kopete/libkopete/kopetemessagehandler.h index fa9c1f31..67858e4d 100644 --- a/kopete/libkopete/kopetemessagehandler.h +++ b/kopete/libkopete/kopetemessagehandler.h @@ -42,9 +42,10 @@ class ChatSession; * This class implements Handler role in the Chain of Responsibility pattern. * The Client role will be filled by the Kopete::MessageHandlerChain class. */ -class KOPETE_EXPORT MessageHandler : public QObject +class KOPETE_EXPORT MessageHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: MessageHandler(); virtual ~MessageHandler() = 0; diff --git a/kopete/libkopete/kopetemessagehandlerchain.h b/kopete/libkopete/kopetemessagehandlerchain.h index a53e0600..cfdf3271 100644 --- a/kopete/libkopete/kopetemessagehandlerchain.h +++ b/kopete/libkopete/kopetemessagehandlerchain.h @@ -44,6 +44,7 @@ class ProcessMessageTask; class MessageHandlerChain : public TQObject, private KShared { Q_OBJECT + TQ_OBJECT public: friend class KSharedPtr<MessageHandlerChain>; typedef KSharedPtr<MessageHandlerChain> Ptr; @@ -73,6 +74,7 @@ private: class ProcessMessageTask : public Task { Q_OBJECT + TQ_OBJECT public: MessageEvent *event(); diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 9a908f32..a031f5bd 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -58,7 +58,7 @@ class MetaContact::Private Private() : photoSource(MetaContact::SourceCustom), displayNameSource(MetaContact::SourceCustom), displayNameSourceContact(0L), photoSourceContact(0L), temporary(false), - onlineStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) + onlinetqStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) {} ~Private() @@ -85,7 +85,7 @@ class MetaContact::Private TQMap<TQString, TQMap<TQString, TQString> > addressBook; bool temporary; - OnlineStatus::StatusType onlineStatus; + OnlineStatus::StatusType onlinetqStatus; bool photoSyncedWithKABC; // Used to set contact source at load. @@ -127,7 +127,7 @@ MetaContact::~MetaContact() void MetaContact::addContact( Contact *c ) { - if( d->contacts.contains( c ) ) + if( d->contacts.tqcontains( c ) ) { kdWarning(14010) << "Ignoring attempt to add duplicate contact " << c->contactId() << "!" << endl; } @@ -171,29 +171,29 @@ void MetaContact::addContact( Contact *c ) void MetaContact::updateOnlineStatus() { - Kopete::OnlineStatus::StatusType newStatus = Kopete::OnlineStatus::Unknown; - Kopete::OnlineStatus mostSignificantStatus; + Kopete::OnlineStatus::StatusType newtqStatus = Kopete::OnlineStatus::Unknown; + Kopete::OnlineStatus mostSignificanttqStatus; for ( TQPtrListIterator<Contact> it( d->contacts ); it.current(); ++it ) { // find most significant status - if ( it.current()->onlineStatus() > mostSignificantStatus ) - mostSignificantStatus = it.current()->onlineStatus(); + if ( it.current()->onlinetqStatus() > mostSignificanttqStatus ) + mostSignificanttqStatus = it.current()->onlinetqStatus(); } - newStatus = mostSignificantStatus.status(); + newtqStatus = mostSignificanttqStatus.status(); - if( newStatus != d->onlineStatus ) + if( newtqStatus != d->onlinetqStatus ) { - d->onlineStatus = newStatus; - emit onlineStatusChanged( this, d->onlineStatus ); + d->onlinetqStatus = newtqStatus; + emit onlineStatusChanged( this, d->onlinetqStatus ); } } void MetaContact::removeContact(Contact *c, bool deleted) { - if( !d->contacts.contains( c ) ) + if( !d->contacts.tqcontains( c ) ) { kdDebug(14010) << k_funcinfo << " Contact is not in this metaContact " << endl; } @@ -257,7 +257,7 @@ void MetaContact::removeContact(Contact *c, bool deleted) } if(!deleted) - { //If this function is tell by slotContactRemoved, c is maybe just a QObject + { //If this function is tell by slotContactRemoved, c is maybe just a TQObject disconnect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); disconnect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), @@ -272,7 +272,7 @@ void MetaContact::removeContact(Contact *c, bool deleted) KABCPersistence::self()->write( this ); } - // Reparent the contact + // Retqparent the contact removeChild( c ); emit contactRemoved( c ); @@ -415,14 +415,14 @@ Contact *MetaContact::preferredContact() continue; } - if( c->onlineStatus().status() > contact->onlineStatus().status() ) + if( c->onlinetqStatus().status() > contact->onlinetqStatus().status() ) contact=c; //this contact has a better status - else if ( c->onlineStatus().status() == contact->onlineStatus().status() ) + else if ( c->onlinetqStatus().status() == contact->onlinetqStatus().status() ) { if( c->account()->priority() > contact->account()->priority() ) contact=c; else if( c->account()->priority() == contact->account()->priority() - && c->onlineStatus().weight() > contact->onlineStatus().weight() ) + && c->onlinetqStatus().weight() > contact->onlinetqStatus().weight() ) contact = c; //the weight is not supposed to follow the same scale for each protocol } } @@ -507,13 +507,13 @@ TQString MetaContact::statusString() const return i18n( "Offline" ); case OnlineStatus::Unknown: default: - return i18n( "Status not available" ); + return i18n( "tqStatus not available" ); } } OnlineStatus::StatusType MetaContact::status() const { - return d->onlineStatus; + return d->onlinetqStatus; } bool MetaContact::isOnline() const @@ -566,7 +566,7 @@ void MetaContact::sendFile( const KURL &sourceURL, const TQString &altFileName, Contact *contact = d->contacts.first(); for( TQPtrListIterator<Contact> it( d->contacts ) ; it.current(); ++it ) { - if( ( *it )->onlineStatus() > contact->onlineStatus() && ( *it )->canAcceptFiles() ) + if( ( *it )->onlinetqStatus() > contact->onlinetqStatus() && ( *it )->canAcceptFiles() ) contact = *it; } @@ -640,7 +640,7 @@ TQString MetaContact::displayName() const TQString nameFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.contains(':') ) + if ( ! id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -653,20 +653,20 @@ TQString nameFromKABC( const TQString &id ) /*const*/ } } // no kabc association, return null image - return TQString::null; + return TQString(); } TQString nameFromContact( Kopete::Contact *c) /*const*/ { if ( !c ) - return TQString::null; + return TQString(); TQString contactName; if ( c->hasProperty( Kopete::Global::Properties::self()->nickName().key() ) ) contactName = c->property( Global::Properties::self()->nickName()).value().toString(); //the replace is there to workaround the Bug 95444 - return contactName.isEmpty() ? c->contactId() : contactName.replace('\n',TQString::fromUtf8("")); + return contactName.isEmpty() ? c->contactId() : contactName.tqreplace('\n',TQString::fromUtf8("")); } KURL MetaContact::customPhoto() const @@ -690,7 +690,7 @@ TQImage MetaContact::photo() const if( picture().image().width() > 96 && picture().image().height() > 96 ) { kdDebug( 14010 ) << k_funcinfo << "Resizing image from " << picture().image().width() << " x " << picture().image().height() << endl; - return picture().image().smoothScale(96,96,TQImage::ScaleMin); + return picture().image().smoothScale(96,96,TQ_ScaleMin); } else return picture().image(); @@ -739,7 +739,7 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/ TQImage photoFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.contains(':') ) + if ( ! id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -859,14 +859,14 @@ void MetaContact::slotPropertyChanged( Contact* subcontact, const TQString &key, void MetaContact::moveToGroup( Group *from, Group *to ) { - if ( !from || !groups().contains( from ) ) + if ( !from || !groups().tqcontains( from ) ) { // We're adding, not moving, because 'from' is illegal addToGroup( to ); return; } - if ( !to || groups().contains( to ) ) + if ( !to || groups().tqcontains( to ) ) { // We're removing, not moving, because 'to' is illegal removeFromGroup( from ); @@ -890,7 +890,7 @@ void MetaContact::moveToGroup( Group *from, Group *to ) void MetaContact::removeFromGroup( Group *group ) { - if ( !group || !groups().contains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) + if ( !group || !groups().tqcontains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) { return; } @@ -912,13 +912,13 @@ void MetaContact::removeFromGroup( Group *group ) void MetaContact::addToGroup( Group *to ) { - if ( !to || groups().contains( to ) ) + if ( !to || groups().tqcontains( to ) ) return; if ( d->temporary && to->type() != Group::Temporary ) return; - if ( d->groups.contains( Group::topLevel() ) ) + if ( d->groups.tqcontains( Group::topLevel() ) ) { d->groups.remove( Group::topLevel() ); emit removedFromGroup( this, Group::topLevel() ); @@ -1058,7 +1058,7 @@ bool MetaContact::fromXML( const TQDomElement& element ) // return false; //the replace is there to workaround the Bug 95444 - d->displayName = contactElement.text().replace('\n',TQString::fromUtf8("")); + d->displayName = contactElement.text().tqreplace('\n',TQString::fromUtf8("")); if ( contactElement.hasAttribute(NSCID_ELEM) && contactElement.hasAttribute(NSPID_ELEM) && contactElement.hasAttribute(NSAID_ELEM)) { @@ -1162,8 +1162,8 @@ bool MetaContact::fromXML( const TQDomElement& element ) } else if( contactElement.tagName() == TQString::fromUtf8( "address-book-field" ) ) { - TQString app = contactElement.attribute( TQString::fromUtf8( "app" ), TQString::null ); - TQString key = contactElement.attribute( TQString::fromUtf8( "key" ), TQString::null ); + TQString app = contactElement.attribute( TQString::fromUtf8( "app" ), TQString() ); + TQString key = contactElement.attribute( TQString::fromUtf8( "key" ), TQString() ); TQString val = contactElement.text(); d->addressBook[ app ][ key ] = val; } @@ -1291,7 +1291,7 @@ void MetaContact::slotUpdateAddressBookPicture() { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); TQString id = metaContactId(); - if ( !id.isEmpty() && !id.contains(':') ) + if ( !id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -1338,7 +1338,7 @@ TQString MetaContact::metaContactId() const { Contact *c=d->contacts.first(); if(!c) - return TQString::null; + return TQString(); return c->protocol()->pluginId()+TQString::fromUtf8(":")+c->account()->accountId()+TQString::fromUtf8(":") + c->contactId() ; } return d->metaContactId; @@ -1360,7 +1360,7 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId ) // other programs may have written that data and depend on it d->metaContactId = newMetaContactId; KABCPersistence::self()->write( this ); - emit onlineStatusChanged( this, d->onlineStatus ); + emit onlineStatusChanged( this, d->onlinetqStatus ); emit persistentDataChanged(); } diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h index d3c95cd7..168fbaa2 100644 --- a/kopete/libkopete/kopetemetacontact.h +++ b/kopete/libkopete/kopetemetacontact.h @@ -57,17 +57,18 @@ class Picture; class KOPETE_EXPORT MetaContact : public ContactListElement, public NotifyDataObject { Q_OBJECT - - Q_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) - Q_PROPERTY( TQString statusString READ statusString ) - Q_PROPERTY( TQString statusIcon READ statusIcon ) - Q_PROPERTY( bool isOnline READ isOnline ) - Q_PROPERTY( bool isReachable READ isReachable ) - Q_PROPERTY( bool isTemporary READ isTemporary ) - Q_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) - //Q_PROPERTY( ulong idleTime READ idleTime ) - Q_PROPERTY( TQString metaContactId READ metaContactId WRITE setMetaContactId ) - Q_PROPERTY( bool photoSyncedWithKABC READ isPhotoSyncedWithKABC WRITE setPhotoSyncedWithKABC ) + TQ_OBJECT + + TQ_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) + TQ_PROPERTY( TQString statusString READ statusString ) + TQ_PROPERTY( TQString statusIcon READ statusIcon ) + TQ_PROPERTY( bool isOnline READ isOnline ) + TQ_PROPERTY( bool isReachable READ isReachable ) + TQ_PROPERTY( bool isTemporary READ isTemporary ) + TQ_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) + //TQ_PROPERTY( ulong idleTime READ idleTime ) + TQ_PROPERTY( TQString metaContactId READ metaContactId WRITE setMetaContactId ) + TQ_PROPERTY( bool photoSyncedWithKABC READ isPhotoSyncedWithKABC WRITE setPhotoSyncedWithKABC ) public: /** @@ -414,7 +415,7 @@ public slots: * file size (such as over a socket) * */ - void sendFile( const KURL &sourceURL, const TQString &altFileName = TQString::null, + void sendFile( const KURL &sourceURL, const TQString &altFileName = TQString(), unsigned long fileSize = 0L ); signals: /** @@ -558,7 +559,7 @@ private slots: /** * One of the child contact's online status changed */ - void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); /** * One of the child contact's property changed diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp index f21d875a..ca50d514 100644 --- a/kopete/libkopete/kopetemimesourcefactory.cpp +++ b/kopete/libkopete/kopetemimesourcefactory.cpp @@ -61,7 +61,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const *it = KURL::decode_string( *it ); TQPixmap img; - if ( parts[0] == TQString::fromLatin1("kopete-contact-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-contact-icon") ) { if ( parts.size() >= 4 ) { @@ -71,7 +71,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const Contact *contact = account->contacts()[ parts[3] ]; if ( contact ) { - img = contact->onlineStatus().iconFor( contact ); + img = contact->onlinetqStatus().iconFor( contact ); completed = true; } else @@ -84,14 +84,14 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-contact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-account-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-account-icon") ) { if ( parts.size() >= 3 ) { Account *account = AccountManager::self()->findAccount( parts[1], parts[2] ); if ( account ) { - img = account->myself()->onlineStatus().iconFor( account->myself() ); + img = account->myself()->onlinetqStatus().iconFor( account->myself() ); completed = true; } else @@ -101,7 +101,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-account-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-metacontact-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-icon") ) { if ( parts.size() >= 2 ) { @@ -116,7 +116,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-metacontact-photo") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-photo") ) { if ( parts.size() >= 2 ) { @@ -133,7 +133,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-photo: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-onlinestatus-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-onlinestatus-icon") ) { if ( parts.size() >= 2 ) { @@ -146,13 +146,13 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const * To find a valid KOS, we ask Kopete's account manager to locate an existing * account. We'll use the myself() instance of that account to reference its * current KOS object, which in turn has access to the global KOS icon cache. - * Note that if the cache has been invalidated in the meantime, we'll just + * Note that if the cache has been tqinvalidated in the meantime, we'll just * get an empty pixmap back. */ Account *account = AccountManager::self()->accounts().getFirst(); if ( account ) { - img = account->myself()->onlineStatus().iconFor( parts[1] ); + img = account->myself()->onlinetqStatus().iconFor( parts[1] ); completed = true; } else diff --git a/kopete/libkopete/kopetemimesourcefactory.h b/kopete/libkopete/kopetemimesourcefactory.h index e9df5994..cf5e586b 100644 --- a/kopete/libkopete/kopetemimesourcefactory.h +++ b/kopete/libkopete/kopetemimesourcefactory.h @@ -36,7 +36,7 @@ namespace Kopete * Note that the various id strings should be URL-encoded (with, for instance, * KURL::encode_string) if they might contain colons. */ -class KOPETE_EXPORT MimeSourceFactory : public QMimeSourceFactory +class KOPETE_EXPORT MimeSourceFactory : public TQMimeSourceFactory { public: MimeSourceFactory(); diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index 5f336a6b..89282b62 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -159,7 +159,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy } KMessageBox::sorry( Kopete::UI::Global::mainWidget(), - sorryText.arg( url.prettyURL() ) ); + sorryText.tqarg( url.prettyURL() ) ); return false; } @@ -200,9 +200,9 @@ void MimeTypeHandler::handleURL( const TQString &mimeType, const KURL &url ) con EmoticonMimeTypeHandler::EmoticonMimeTypeHandler() : MimeTypeHandler( false ) { - registerAsMimeHandler( TQString::fromLatin1("application/x-kopete-emoticons") ); - registerAsMimeHandler( TQString::fromLatin1("application/x-tgz") ); - registerAsMimeHandler( TQString::fromLatin1("application/x-tbz") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-kopete-emoticons") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-tgz") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-tbz") ); } void EmoticonMimeTypeHandler::handleURL( const TQString &, const KURL &url ) const diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 7ba7ab80..9cde4133 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -39,13 +39,13 @@ Kopete::NotifyDataObject::~NotifyDataObject() Kopete::NotifyEvent * Kopete::NotifyDataObject::notifyEvent( const TQString &event ) const { - Kopete::NotifyEvent *evt = d->events.find( event ); + Kopete::NotifyEvent *evt = d->events.tqfind( event ); return evt; } void Kopete::NotifyDataObject::setNotifyEvent( const TQString& event, Kopete::NotifyEvent *notifyEvent ) { - d->events.replace( event, notifyEvent ); + d->events.tqreplace( event, notifyEvent ); } bool Kopete::NotifyDataObject::removeNotifyEvent( const TQString &event ) @@ -60,14 +60,14 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() if ( !d->events.isEmpty() ) { //<custom-notifications> - notifications = notify.createElement( TQString::fromLatin1( "custom-notifications" ) ); + notifications = notify.createElement( TQString::tqfromLatin1( "custom-notifications" ) ); TQDictIterator<Kopete::NotifyEvent> it( d->events ); for ( ; it.current(); ++it ) { //<event name="..." suppress-common="true|false"> - TQDomElement event = notify.createElement( TQString::fromLatin1( "event" ) ); - event.setAttribute( TQString::fromLatin1( "name" ), it.currentKey() ); - event.setAttribute( TQString::fromLatin1( "suppress-common" ), TQString::fromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); + TQDomElement event = notify.createElement( TQString::tqfromLatin1( "event" ) ); + event.setAttribute( TQString::tqfromLatin1( "name" ), it.currentKey() ); + event.setAttribute( TQString::tqfromLatin1( "suppress-common" ), TQString::tqfromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); TQValueList<TQDomElement> presentations = it.current()->toXML(); //<sound-notification enabled="true|false" src="..." single-shot=""> for ( TQValueList<TQDomElement>::Iterator it = presentations.begin(); it != presentations.end(); ++it ) @@ -80,57 +80,57 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() bool Kopete::NotifyDataObject::notifyDataFromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::fromLatin1( "custom-notifications" ) ) + if ( element.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) { TQDomNode field = element.firstChild(); while( !field.isNull() ) { //read an event TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::fromLatin1( "event" ) ) + if ( fieldElement.tagName() == TQString::tqfromLatin1( "event" ) ) { // get its attributes - TQString name = fieldElement.attribute( TQString::fromLatin1( "name" ), TQString::null ); - TQString suppress = fieldElement.attribute( TQString::fromLatin1( "suppress-common" ), TQString::null ); - Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::fromLatin1( "true" ) ); + TQString name = fieldElement.attribute( TQString::tqfromLatin1( "name" ), TQString() ); + TQString suppress = fieldElement.attribute( TQString::tqfromLatin1( "suppress-common" ), TQString() ); + Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::tqfromLatin1( "true" ) ); - // get its children + // get its tqchildren TQDomNode child = fieldElement.firstChild(); while( !child.isNull() ) { TQDomElement childElement = child.toElement(); - if ( childElement.tagName() == TQString::fromLatin1( "sound-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "sound-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: sound" << endl; - TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Sound, src, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Sound, pres ); // kdDebug(14010) << k_funcinfo << "after sound: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::fromLatin1( "message-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "message-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: msg" << endl; - TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Message, src, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Message, pres ); // kdDebug(14010) << k_funcinfo << "after message: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::fromLatin1( "chat-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "chat-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: chat" << endl; - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); - Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString::null, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString(), + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Chat, pres ); // kdDebug(14010) << k_funcinfo << "after chat: " << evt->toString() << endl; } diff --git a/kopete/libkopete/kopetenotifyevent.cpp b/kopete/libkopete/kopetenotifyevent.cpp index 4bd9fad7..b233774b 100644 --- a/kopete/libkopete/kopetenotifyevent.cpp +++ b/kopete/libkopete/kopetenotifyevent.cpp @@ -144,25 +144,25 @@ const TQValueList<TQDomElement> Kopete::NotifyEvent::toXML() const TQValueList<TQDomElement> eventNodes; if ( m_sound && !m_sound->content().isEmpty() ) { - TQDomElement soundElmt = eventData.createElement( TQString::fromLatin1( "sound-presentation" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_sound->enabled() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_sound->singleShot() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "src" ), m_sound->content() ); + TQDomElement soundElmt = eventData.createElement( TQString::tqfromLatin1( "sound-presentation" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_sound->enabled() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_sound->singleShot() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_sound->content() ); eventNodes.append( soundElmt ); } if ( m_message && !m_message->content().isEmpty() ) { - TQDomElement msgElmt = eventData.createElement( TQString::fromLatin1( "message-presentation" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_message->enabled() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_message->singleShot() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "src" ), m_message->content() ); + TQDomElement msgElmt = eventData.createElement( TQString::tqfromLatin1( "message-presentation" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_message->enabled() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_message->singleShot() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_message->content() ); eventNodes.append( msgElmt ); } if ( m_chat && m_chat->enabled() ) { - TQDomElement chatElmt = eventData.createElement( TQString::fromLatin1( "chat-presentation" ) ); - chatElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( "true" ) ); - chatElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_chat->singleShot() ? "true" : "false" ) ); + TQDomElement chatElmt = eventData.createElement( TQString::tqfromLatin1( "chat-presentation" ) ); + chatElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( "true" ) ); + chatElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_chat->singleShot() ? "true" : "false" ) ); eventNodes.append( chatElmt ); } return eventNodes; @@ -170,7 +170,7 @@ const TQValueList<TQDomElement> Kopete::NotifyEvent::toXML() const TQString Kopete::NotifyEvent::toString() { - TQString stringRep = TQString::fromLatin1("Event; Suppress common=%1").arg( TQString::fromLatin1( suppressCommon() ? "true" : "false" ) ); + TQString stringRep = TQString::tqfromLatin1("Event; Suppress common=%1").tqarg( TQString::tqfromLatin1( suppressCommon() ? "true" : "false" ) ); if ( m_sound) stringRep += m_sound->toString(); if ( m_message) diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp index da9bb5d5..b888c246 100644 --- a/kopete/libkopete/kopeteonlinestatus.cpp +++ b/kopete/libkopete/kopeteonlinestatus.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online Status + kopeteonlinestatus.cpp - Kopete Online tqStatus Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -49,7 +49,7 @@ public: TQString protocolIcon() const { - return protocol ? protocol->pluginIcon() : TQString::fromLatin1( "unknown" ); + return protocol ? protocol->pluginIcon() : TQString::tqfromLatin1( "unknown" ); } }; @@ -124,7 +124,7 @@ OnlineStatus::OnlineStatus( StatusType status ) case Unknown: default: d->description = i18n( "Unknown" ); - d->overlayIcons = TQString::fromLatin1("status_unknown"); + d->overlayIcons = TQString::tqfromLatin1("status_unknown"); break; } @@ -137,7 +137,7 @@ OnlineStatus::OnlineStatus() d->internalStatus = 0; d->weight = 0; d->protocol = 0L; - d->overlayIcons = TQString::fromLatin1( "status_unknown" ); + d->overlayIcons = TQString::tqfromLatin1( "status_unknown" ); } OnlineStatus::OnlineStatus( const OnlineStatus &other ) @@ -283,9 +283,9 @@ TQString OnlineStatus::statusTypeToString(OnlineStatus::StatusType statusType) for (int i=0; i< size; i++) if (statusNames[i].status == statusType) - return TQString::fromLatin1(statusNames[i].name); + return TQString::tqfromLatin1(statusNames[i].name); - return TQString::fromLatin1(statusNames[0].name); // Unknown + return TQString::tqfromLatin1(statusNames[0].name); // Unknown } OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) @@ -293,7 +293,7 @@ OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) int size = sizeof(statusNames) / sizeof(statusNames[0]); for (int i=0; i< size; i++) - if (TQString::fromLatin1(statusNames[i].name) == string) + if (TQString::tqfromLatin1(statusNames[i].name) == string) return statusNames[i].status; return OnlineStatus::Unknown; diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h index dfdb39df..a1296f17 100644 --- a/kopete/libkopete/kopeteonlinestatus.h +++ b/kopete/libkopete/kopeteonlinestatus.h @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.h - Kopete Online Status + kopeteonlinestatus.h - Kopete Online tqStatus Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -128,7 +128,7 @@ public: * Any internal status value > 0x80000000 is reserved for internal * libkopete use. This enumeration lists the currently known values. */ - enum ReservedInternalStatus + enum ReservedInternaltqStatus { /** * The account this contact belongs to is offline. Used with @@ -167,9 +167,9 @@ public: * @param internalStatus is the status as used internally by the protocol. * This status is usually a lot more fine-grained than the status as used * by libkopete and should be unique per protocol. - * @param overlayIcons is a list of QStrings which are the name of status + * @param overlayIcons is a list of TQStrings which are the name of status * icons to be used by the KDE icon loader. (Statuses which don't have icons - * to overlay like Online and Offline should use TQString::null as icon + * to overlay like Online and Offline should use TQString() as icon * name ). NOTE if the string is a movie ( *.mng ) it must be the first string in the list. * TODO: KDE4 sort out movies and overlay icons. * @param description is a description in e.g. tooltips. @@ -202,8 +202,8 @@ public: * This status is usually a lot more fine-grained than the status as used * by libkopete and should be unique per protocol. * @param overlayIcon is a string returning the name of the status icon to be - * used by the KDE icon loader. (Status whiwh doesn't have icon to overlay like - * Online and Offline should use TQString::null as icon string) + * used by the KDE icon loader. (tqStatus whiwh doesn't have icon to overlay like + * Online and Offline should use TQString() as icon string) * @param description is a description in e.g. tooltips. * @param caption is the text of the action in the menu * @param categories the categories this online status is in @@ -332,7 +332,7 @@ public: * * You can access icons with this method that have previously been rendered * using mimeSourceFor(). Note that only a cache lookup will be done, so - * if the cache has been invalidated due to a change of icon sets between + * if the cache has been tqinvalidated due to a change of icon sets between * requesting the key (thus rendering the icon) and trying to access the * icon by key, an invalid pixmap will be returned. */ @@ -389,7 +389,7 @@ public: static TQString statusTypeToString(OnlineStatus::StatusType status); /** - * \brief returns a StatusType from a QString + * \brief returns a StatusType from a TQString * * Static method to convert a TQString representing a StatusType to a StatusType to avoid * many issues when saving StatusType to disk diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 27fa0db1..c0cef12f 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -49,7 +49,7 @@ class OnlineStatusManager::Private typedef TQMap< OnlineStatus , RegisteredStatusStruct > ProtocolMap ; TQPixmap *nullPixmap; - TQMap<Protocol* , ProtocolMap > registeredStatus; + TQMap<Protocol* , ProtocolMap > registeredtqStatus; TQDict< TQPixmap > iconCache; }; @@ -89,10 +89,10 @@ void OnlineStatusManager::registerOnlineStatus( const OnlineStatus &status, cons s.caption=caption; s.categories=categories; s.options=options; - d->registeredStatus[status.protocol()].insert(status, s ); + d->registeredtqStatus[status.protocol()].insert(status, s ); } -OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories category) const +OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories category) const { /* Each category has a number which is a power of two, so it is possible to have several categories per online status * the logaritm in base two if this number, which represent the bit which is equal to 1 in the number is chosen to be in a tree @@ -103,10 +103,10 @@ OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories c * 4 5 6 7 * /\ / \ / \ / \ * 8 9 10 11 12 13 14 15 - * To get the parent of a key, one just divide per two the number + * To get the tqparent of a key, one just divide per two the number */ - Private::ProtocolMap protocolMap=d->registeredStatus[protocol]; + Private::ProtocolMap protocolMap=d->registeredtqStatus[protocol]; int categ_nb=-1; //the logaritm of category uint category_=category; @@ -137,13 +137,13 @@ TQString OnlineStatusManager::fingerprint( const OnlineStatus &statusFor, const { // create a 'fingerprint' to use as a hash key // fingerprint consists of description/icon name/color/overlay name/size/idle state - return TQString::fromLatin1("%1/%2/%3/%4/%5/%6") - .arg( statusFor.description() ) - .arg( icon ) - .arg( color.name() ) - .arg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) ) - .arg( size ) - .arg( idle ? 'i' : 'a' ); + return TQString::tqfromLatin1("%1/%2/%3/%4/%5/%6") + .tqarg( statusFor.description() ) + .tqarg( icon ) + .tqarg( color.name() ) + .tqarg( statusFor.overlayIcons().join( TQString::tqfromLatin1( "," ) ) ) + .tqarg( size ) + .tqarg( idle ? 'i' : 'a' ); } TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor, const TQString& icon, int size, TQColor color, bool idle) @@ -151,7 +151,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQString fp = fingerprint( statusFor, icon, size, color, idle ); // look it up in the cache - TQPixmap *theIcon= d->iconCache.find( fp ); + TQPixmap *theIcon= d->iconCache.tqfind( fp ); if ( !theIcon ) { // cache miss @@ -165,7 +165,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQPixmap OnlineStatusManager::cacheLookupByMimeSource( const TQString &mimeSource ) { // look it up in the cache - const TQPixmap *theIcon= d->iconCache.find( mimeSource ); + const TQPixmap *theIcon= d->iconCache.tqfind( mimeSource ); if ( !theIcon ) { // need to return an invalid pixmap @@ -201,23 +201,23 @@ static void blendOnLower( const TQImage &upper_, TQImage &lower, const TQPoint & for ( int j = cy; j < ch; ++j ) { - QRgb *u = (QRgb*)upper.scanLine(j - cy); - QRgb *l = (QRgb*)lower.scanLine(j) + cx; + TQRgb *u = (TQRgb*)upper.scanLine(j - cy); + TQRgb *l = (TQRgb*)lower.scanLine(j) + cx; for( int k = cx; k < cw; ++u, ++l, ++k ) { - int ua = qAlpha(*u); + int ua = tqAlpha(*u); if ( !ua ) continue; - int la = qAlpha(*l); + int la = tqAlpha(*l); int d = ua * m + la * (m - ua); - uchar r = uchar( ( qRed(*u) * ua * m + qRed(*l) * la * (m - ua) ) / d ); - uchar g = uchar( ( qGreen(*u) * ua * m + qGreen(*l) * la * (m - ua) ) / d ); - uchar b = uchar( ( qBlue(*u) * ua * m + qBlue(*l) * la * (m - ua) ) / d ); + uchar r = uchar( ( tqRed(*u) * ua * m + tqRed(*l) * la * (m - ua) ) / d ); + uchar g = uchar( ( tqGreen(*u) * ua * m + tqGreen(*l) * la * (m - ua) ) / d ); + uchar b = uchar( ( tqBlue(*u) * ua * m + tqBlue(*l) * la * (m - ua) ) / d ); uchar a = uchar( ( ua * ua * m + la * la * (m - ua) ) / d ); - *l = qRgba( r, g, b, a ); + *l = tqRgba( r, g, b, a ); } } } @@ -236,11 +236,11 @@ static TQRect getBoundingBox( const TQImage& image ) int y1 = height - 1; for ( int j = 0; j < height; ++j ) { - QRgb *i = (QRgb*)image.scanLine(j); + TQRgb *i = (TQRgb*)image.scanLine(j); for( int k = 0; k < width; ++i, ++k ) { - if ( qAlpha(*i) ) + if ( tqAlpha(*i) ) { x1 = std::min( x1, k ); y1 = std::min( y1, j ); @@ -255,11 +255,11 @@ static TQRect getBoundingBox( const TQImage& image ) int y2 = 0; for ( int j = height-1; j >= 0; --j ) { - QRgb *i = (QRgb*)image.scanLine(j) + width-1; + TQRgb *i = (TQRgb*)image.scanLine(j) + width-1; for( int k = width-1; k >= 0; --i, --k ) { - if ( qAlpha(*i) ) + if ( tqAlpha(*i) ) { x2 = std::max( x2, k ); y2 = std::max( y2, j ); @@ -335,12 +335,12 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const if ( !overlay.isNull() ) { // we want to preserve the alpha channels of both basis and overlay. - // there's no way to do this in Qt. In fact, there's no way to do this + // there's no way to do this in TQt. In fact, there's no way to do this // in KDE since KImageEffect is so badly broken. TQImage basisImage = basis->convertToImage(); TQImage overlayImage = overlay.convertToImage(); TQPoint offset; - if ( (*it).endsWith( TQString::fromLatin1( "_overlay" ) ) ) + if ( (*it).endsWith( TQString::tqfromLatin1( "_overlay" ) ) ) { // it is possible to have more than one overlay icon // to avoid overlapping we place them in different corners @@ -368,9 +368,9 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const return basis; } -void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent) +void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *tqparent) { - Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()]; + Private::ProtocolMap protocolMap=d->registeredtqStatus[account->protocol()]; Private::ProtocolMap::Iterator it; for ( it = --protocolMap.end(); it != protocolMap.end(); --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 parent's child list. + // from the tqparent'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(parent) - parent->insert(action); + if(tqparent) + tqparent->insert(action); } } -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) +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) { connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated())); } diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h index 7a52d8c2..0ce2f983 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.h +++ b/kopete/libkopete/kopeteonlinestatusmanager.h @@ -39,9 +39,10 @@ namespace Kopete * * @author Olivier Goffart */ -class KOPETE_EXPORT OnlineStatusManager : public QObject +class KOPETE_EXPORT OnlineStatusManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static OnlineStatusManager* self(); ~OnlineStatusManager(); @@ -53,9 +54,9 @@ public: * * Idle is the status used for auto-away * - * Status number are organised so that make a tree. + * tqStatus number are organised so that make a tree. */ - //please be carrefull when modifying values of status. read comment in onlineStatus() + //please be carrefull when modifying values of status. read comment in onlinetqStatus() enum Categories { Idle=1<<8, ExtendedAway=1<<9 , Invisible=1<<10, @@ -105,23 +106,23 @@ public: void registerOnlineStatus(const OnlineStatus& status, const TQString &caption, unsigned int categories=0x00 , unsigned int options=0x0); /** - * insert "setStatus" actions from the given account to the specified actionMenu. - * (actions have that menu as parent TQObject) + * insert "settqStatus" actions from the given account to the specified actionMenu. + * (actions have that menu as tqparent TQObject) * they are connected to the Account::setOnlineStatus signal * * Items are stored by status height. * * @param account the account - * @param parent the ActionMenu where action are inserted + * @param tqparent the ActionMenu where action are inserted */ - void createAccountStatusActions( Account *account , KActionMenu *parent); + void createAccountStatusActions( Account *account , KActionMenu *tqparent); /** * return the status of the @p protocol which is in the category @p category * * If no status has been registered in this category, return the one in the category which is the most similair */ - OnlineStatus onlineStatus(Protocol *protocol, Categories category) const; + OnlineStatus onlinetqStatus(Protocol *protocol, Categories category) const; private: friend class OnlineStatus; @@ -151,8 +152,9 @@ private: class OnlineStatusAction : public KAction { Q_OBJECT + TQ_OBJECT public: - OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent=0, const char *name=0); + OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *tqparent=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 5edc1b27..329ba8e8 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -61,7 +61,7 @@ public: const TQString configGroup; /** Is the password being remembered? */ bool remembered; - /** The current password in the KConfig file, or TQString::null if no password there */ + /** The current password in the KConfig file, or TQString() if no password there */ TQString passwordFromKConfig; /** The maximum length allowed for this password, or -1 if there is no limit */ uint maximumLength; @@ -146,7 +146,7 @@ public: if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() ) return mPassword.d->passwordFromKConfig; - return TQString::null; + return TQString(); } void finished( const TQString &result ) @@ -215,7 +215,7 @@ public: void slotCancelPressed() { - finished( TQString::null ); + finished( TQString() ); } private: @@ -276,7 +276,7 @@ public: if ( mWallet && mWallet->writePassword( mPassword.d->configGroup, mNewPass ) == 0 ) { mPassword.d->remembered = true; - mPassword.d->passwordFromKConfig = TQString::null; + mPassword.d->passwordFromKConfig = TQString(); mPassword.writeConfig(); return true; } @@ -288,13 +288,13 @@ 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 parent TQObject, so we should survive. + // everything should work out OK. We have no tqparent 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>" ), i18n( "Unable to Store Secure Password" ), - KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ), - TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) + KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ) ), + TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) { return false; } @@ -329,7 +329,7 @@ public: if ( clearPassword() ) { mPassword.setWrong( true ); - mPassword.d->cachedValue = TQString::null; + mPassword.d->cachedValue = TQString(); } delete this; @@ -339,7 +339,7 @@ public: kdDebug( 14010 ) << k_funcinfo << " clearing password" << endl; mPassword.d->remembered = false; - mPassword.d->passwordFromKConfig = TQString::null; + mPassword.d->passwordFromKConfig = TQString(); mPassword.writeConfig(); if ( mWallet ) mWallet->removeEntry( mPassword.d->configGroup ); @@ -385,7 +385,7 @@ void Kopete::Password::readConfig() TQString passwordCrypted = config->readEntry( "Password" ); if ( passwordCrypted.isNull() ) - d->passwordFromKConfig = TQString::null; + d->passwordFromKConfig = TQString(); else d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted ); @@ -448,7 +448,7 @@ void Kopete::Password::setWrong( bool bWrong ) d->isWrong = bWrong; writeConfig(); - if ( bWrong ) d->cachedValue = TQString::null; + if ( bWrong ) d->cachedValue = TQString(); } void Kopete::Password::requestWithoutPrompt( TQObject *returnObj, const char *slot ) diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h index f2629234..3846d6d1 100644 --- a/kopete/libkopete/kopetepassword.h +++ b/kopete/libkopete/kopetepassword.h @@ -43,9 +43,10 @@ namespace Kopete * If the KWallet is active, passwords will be stored in it, otherwise, they * will be stored in the KConfig, in a slightly mangled form. */ -class KOPETE_EXPORT Password : public QObject +class KOPETE_EXPORT Password : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -127,10 +128,10 @@ public: * @param receiver The object to notify when the password request finishes * @param slot The slot on receiver to call at the end of the request. The signature * of this function should be slot( const TQString &password ). password will - * be the password if successful, or TQString::null if failed. + * be the password if successful, or TQString() if failed. * @param image The icon to display in the dialog when asking for the password * @param prompt The message to display to the user, asking for a - * password. Can be any Qt RichText string. + * password. Can be any TQt RichText string. * @param source The source the password is taken from if a wrong or * invalid password is entered or the password could not be found in the wallet */ @@ -163,7 +164,7 @@ public: /** * When a password request succeeds, the password is cached. This function - * returns the cached password, if there is one, or TQString::null if there + * returns the cached password, if there is one, or TQString() if there * is not. */ TQString cachedValue(); @@ -171,13 +172,13 @@ public: public slots: /** * Set the password for this account. - * @param pass If set to TQString::null, the password is forgotten unless you + * @param pass If set to TQString(), the password is forgotten unless you * specified to allow blank passwords. Otherwise, sets the password to * this value. * * Note: this function is asynchronous; changes will not be instant. */ - void set( const TQString &pass = TQString::null ); + void set( const TQString &pass = TQString() ); /** * Unconditionally clears the stored password @@ -204,9 +205,10 @@ private: * @internal * @see KopetePassword */ -class KopetePasswordRequestBase : public virtual QObject +class KopetePasswordRequestBase : public virtual TQObject { Q_OBJECT + TQ_OBJECT signals: void requestFinished( const TQString &password ); public slots: diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index cf0e2932..f1323f45 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -28,17 +28,17 @@ struct Kopete::PasswordedAccount::Private Private( const TQString &group, uint maxLen, bool allowBlankPassword ) : password( group, maxLen, allowBlankPassword, "mPassword" ) {} Kopete::Password password; - Kopete::OnlineStatus initialStatus; + Kopete::OnlineStatus initialtqStatus; }; -Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, false ) ) +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, +Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, bool allowBlankPassword, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) + : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) { } @@ -58,12 +58,12 @@ void Kopete::PasswordedAccount::connect( ) connect( s ); } -void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStatus ) +void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqStatus ) { // check that the networkstatus is up // warn user somewhere - d->initialStatus = initialStatus; + d->initialtqStatus = initialtqStatus; TQString cached = password().cachedValue(); if( !cached.isNull() || d->password.allowBlankPassword() ) { @@ -80,19 +80,19 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStat TQString Kopete::PasswordedAccount::passwordPrompt() { if ( password().isWrong() ) - return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() ); + return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() ); else - return i18n( "Please enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() ); + return i18n( "Please enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() ); } -Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus() +Kopete::OnlineStatus Kopete::PasswordedAccount::initialtqStatus() { - return d->initialStatus; + return d->initialtqStatus; } bool Kopete::PasswordedAccount::removeAccount() { - password().set(TQString::null); + password().set(TQString()); return Kopete::Account::removeAccount(); } diff --git a/kopete/libkopete/kopetepasswordedaccount.h b/kopete/libkopete/kopetepasswordedaccount.h index dbec92db..a9fa2f54 100644 --- a/kopete/libkopete/kopetepasswordedaccount.h +++ b/kopete/libkopete/kopetepasswordedaccount.h @@ -35,30 +35,31 @@ class Password; class KOPETE_EXPORT PasswordedAccount : public Account { Q_OBJECT + TQ_OBJECT public: /** * KopetePasswordedAccount constructor - * @param parent The protocol this account connects via + * @param tqparent 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 QObject + * @param name The name for this TQObject * * @deprecated Use the constructor that specifies if a blank password is allowed */ - PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); /** * KopetePasswordedAccount constructor - * @param parent The protocol this account connects via + * @param tqparent 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 QObject + * @param name The name for this TQObject */ - PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, + PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, bool allowBlankPassword = false, const char *name = 0 ); virtual ~PasswordedAccount(); @@ -73,15 +74,15 @@ public: /** * @brief Go online for this service. * - * @param initialStatus is the status to connect with. If it is an invalid status for this + * @param initialtqStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - void connect( const OnlineStatus& initialStatus ); + void connect( const OnlineStatus& initialtqStatus ); /** * \brief Get the initial status */ - OnlineStatus initialStatus(); + OnlineStatus initialtqStatus(); /** * @brief Remove the account from the server. @@ -97,7 +98,7 @@ public: public slots: /** * Called when your account should attempt to connect. - * @param password The password to connect with, or TQString::null + * @param password The password to connect with, or TQString() * if the user wished to cancel the connection attempt. */ virtual void connectWithPassword( const TQString &password ) = 0; diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp index 05468c21..809923d2 100644 --- a/kopete/libkopete/kopetepicture.cpp +++ b/kopete/libkopete/kopetepicture.cpp @@ -120,7 +120,7 @@ TQString Picture::path() KMD5 context(tempArray); // Save the image to a file. localPhotoPath = context.hexDigest() + ".png"; - localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").arg( localPhotoPath) ); + localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").tqarg( localPhotoPath) ); if( image().save(localPhotoPath, "PNG") ) { d->picturePath = localPhotoPath; @@ -145,8 +145,8 @@ bool Picture::isNull() void Picture::clear() { detach(); - d->pictureBase64 = TQString::null; - d->picturePath = TQString::null; + d->pictureBase64 = TQString(); + d->picturePath = TQString(); d->pictureImage = TQImage(); } @@ -157,8 +157,8 @@ void Picture::setPicture(const TQImage &image) d->pictureImage = image; // Clear the path and base64, it will call the update of then when "getted" - d->picturePath= TQString::null; - d->pictureBase64 = TQString::null; + d->picturePath= TQString(); + d->pictureBase64 = TQString(); } void Picture::setPicture(const TQString &path) @@ -168,7 +168,7 @@ void Picture::setPicture(const TQString &path) // Clear the image and base64, it will call the update of then when "getted" d->pictureImage = TQImage(); - d->pictureBase64 = TQString::null; + d->pictureBase64 = TQString(); } void Picture::setPicture(const KABC::Picture &picture) diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 3c31545a..13afd9ca 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -32,8 +32,8 @@ public: TQString indexField; }; -Plugin::Plugin( KInstance *instance, TQObject *parent, const char *name ) -: TQObject( parent, name ), KXMLGUIClient(), d(new Private) +Plugin::Plugin( KInstance *instance, TQObject *tqparent, const char *name ) +: TQObject( tqparent, name ), KXMLGUIClient(), d(new Private) { setInstance( instance ); KSettings::Dispatcher::self()->registerInstance( instance, this, TQT_SIGNAL( settingsChanged() ) ); @@ -46,18 +46,18 @@ Plugin::~Plugin() TQString Plugin::pluginId() const { - return TQString::fromLatin1( className() ); + return TQString::tqfromLatin1( className() ); } TQString Plugin::displayName() const { - return pluginInfo() ? pluginInfo()->name() : TQString::null; + return pluginInfo() ? pluginInfo()->name() : TQString(); } TQString Plugin::pluginIcon() const { - return pluginInfo() ? pluginInfo()->icon() : TQString::null; + return pluginInfo() ? pluginInfo()->icon() : TQString(); } diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index eebad0d2..311c796f 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 *parent, const char *name, const TQStringList & args ) - : Kopete::Plugin( MyPluginFactory::instance(), parent, name ) + MyPlugin::MyPlugin( TQObject *tqparent, const char *name, const TQStringList & args ) + : Kopete::Plugin( MyPluginFactory::instance(), tqparent, name ) { //... } @@ -90,9 +90,10 @@ Comment=Plugin that do some nice stuff class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - Plugin( KInstance *instance, TQObject *parent, const char *name ); + Plugin( KInstance *instance, TQObject *tqparent, const char *name ); virtual ~Plugin(); /** diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 1aff9e9f..d11e413b 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -89,10 +89,10 @@ PluginManager* PluginManager::self() return s_self; } -PluginManager::PluginManager() : TQObject( qApp ), d( new Private ) +PluginManager::PluginManager() : TQObject( tqApp ), d( new Private ) { - d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ), - TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); + d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "Kopete/Plugin" ), + TQString::tqfromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); // We want to add a reference to the application's event loop so we // can remain in control when all windows are removed. @@ -188,7 +188,7 @@ void PluginManager::shutdown() it != d->loadedPlugins.end(); /* EMPTY */ ) { // Plugins could emit their ready for unload signal directly in response to this, - // which would invalidate the current iterator. Therefore, we copy the iterator + // which would tqinvalidate the current iterator. Therefore, we copy the iterator // and increment it beforehand. Private::InfoToPluginMap::ConstIterator current( it ); ++it; @@ -215,7 +215,7 @@ void PluginManager::slotPluginReadyForUnload() // less clean for plugin authors // FIXME: I don't buy the above argument. Add a Kopete::Plugin::emitReadyForUnload(void), // and make readyForUnload be passed a plugin. - Richard - Plugin *plugin = dynamic_cast<Plugin *>( const_cast<TQObject *>( sender() ) ); + Plugin *plugin = dynamic_cast<Plugin *>( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) ) ); kdDebug( 14010 ) << k_funcinfo << plugin->pluginId() << "ready for unload" << endl; if ( !plugin ) { @@ -239,7 +239,7 @@ void PluginManager::slotShutdownTimeout() remaining.append( it.data()->pluginId() ); kdWarning( 14010 ) << k_funcinfo << "Some plugins didn't shutdown in time!" << endl - << "Remaining plugins: " << remaining.join( TQString::fromLatin1( ", " ) ) << endl + << "Remaining plugins: " << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl << "Forcing Kopete shutdown now." << endl; slotShutdownDone(); @@ -259,30 +259,30 @@ void PluginManager::loadAllPlugins() // FIXME: We need session management here - Martijn KConfig *config = KGlobal::config(); - if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) + if ( config->hasGroup( TQString::tqfromLatin1( "Plugins" ) ) ) { TQMap<TQString, bool> pluginsMap; - TQMap<TQString, TQString> entries = config->entryMap( TQString::fromLatin1( "Plugins" ) ); + TQMap<TQString, TQString> entries = config->entryMap( TQString::tqfromLatin1( "Plugins" ) ); TQMap<TQString, TQString>::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) - pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::fromLatin1( "true" )) ); + if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) + pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::tqfromLatin1( "true" )) ); } - TQValueList<KPluginInfo *> plugins = availablePlugins( TQString::null ); + TQValueList<KPluginInfo *> plugins = availablePlugins( TQString() ); TQValueList<KPluginInfo *>::ConstIterator it2 = plugins.begin(); TQValueList<KPluginInfo *>::ConstIterator end = plugins.end(); for ( ; it2 != end; ++it2 ) { // Protocols are loaded automatically so they aren't always in Plugins group. (fixes bug 167113) - if ( (*it2)->category() == TQString::fromLatin1( "Protocols" ) ) + if ( (*it2)->category() == TQString::tqfromLatin1( "Protocols" ) ) continue; TQString pluginName = (*it2)->pluginName(); - bool inMap = pluginsMap.contains( pluginName ); + bool inMap = pluginsMap.tqcontains( pluginName ); if ( (inMap && pluginsMap[pluginName]) || (!inMap && (*it2)->isPluginEnabledByDefault()) ) { if ( !plugin( pluginName ) ) @@ -301,7 +301,7 @@ void PluginManager::loadAllPlugins() else { // we had no config, so we load any plugins that should be loaded by default. - TQValueList<KPluginInfo *> plugins = availablePlugins( TQString::null ); + TQValueList<KPluginInfo *> plugins = availablePlugins( TQString() ); TQValueList<KPluginInfo *>::ConstIterator it = plugins.begin(); TQValueList<KPluginInfo *>::ConstIterator end = plugins.end(); for ( ; it != end; ++it ) @@ -343,10 +343,10 @@ Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mo // Try to find legacy code // FIXME: Find any cases causing this, remove them, and remove this too - Richard - if ( pluginId.endsWith( TQString::fromLatin1( ".desktop" ) ) ) + if ( pluginId.endsWith( TQString::tqfromLatin1( ".desktop" ) ) ) { kdWarning( 14010 ) << "Trying to use old-style API!" << endl << kdBacktrace() << endl; - pluginId = pluginId.remove( TQRegExp( TQString::fromLatin1( ".desktop$" ) ) ); + pluginId = pluginId.remove( TQRegExp( TQString::tqfromLatin1( ".desktop$" ) ) ); } if ( mode == LoadSync ) @@ -372,12 +372,12 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) return 0L; } - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; int error = 0; - Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "Kopete/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); + Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::tqfromLatin1( "Kopete/Plugin" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -465,21 +465,21 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const { // Hack for compatibility with Plugin::pluginId(), which returns // classname() instead of the internal name. Changing that is not easy - // as it invalidates the config file, the contact list, and most likely + // as it tqinvalidates the config file, the contact list, and most likely // other code as well. // For now, just transform FooProtocol to kopete_foo. // FIXME: In the future we'll need to change this nevertheless to unify // the handling - Martijn TQString pluginId = _pluginId; - if ( pluginId.endsWith( TQString::fromLatin1( "Protocol" ) ) ) - pluginId = TQString::fromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::fromLatin1( "protocol" ) ); + if ( pluginId.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) + pluginId = TQString::tqfromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::tqfromLatin1( "protocol" ) ); // End hack KPluginInfo *info = infoForPluginId( pluginId ); if ( !info ) return 0L; - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; else return 0L; @@ -506,13 +506,13 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard - if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) ) - pluginId.prepend( TQString::fromLatin1( "kopete_" ) ); + if ( !pluginId.startsWith( TQString::tqfromLatin1( "kopete_" ) ) ) + pluginId.prepend( TQString::tqfromLatin1( "kopete_" ) ); if ( !infoForPluginId( pluginId ) ) return false; - config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); + config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); config->sync(); return true; diff --git a/kopete/libkopete/kopetepluginmanager.h b/kopete/libkopete/kopetepluginmanager.h index a250b091..7cf69a48 100644 --- a/kopete/libkopete/kopetepluginmanager.h +++ b/kopete/libkopete/kopetepluginmanager.h @@ -40,9 +40,10 @@ typedef TQValueList<Plugin*> PluginList; * @author Duncan Mac-Vicar Prett <duncan@kde.org> * @author Martijn Klingens <klingens@kde.org> */ -class KOPETE_EXPORT PluginManager : public QObject +class KOPETE_EXPORT PluginManager : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( PluginLoadMode ) public: @@ -63,14 +64,14 @@ public: * You can query all information on the plugins through the KPluginInfo * interface. */ - TQValueList<KPluginInfo *> availablePlugins( const TQString &category = TQString::null ) const; + TQValueList<KPluginInfo *> availablePlugins( const TQString &category = TQString() ) const; /** * Returns a list of all plugins that are actually loaded. * If you omit the category you get all, otherwise it's a filtered list. * See also @ref availablePlugins(). */ - PluginList loadedPlugins( const TQString &category = TQString::null ) const; + PluginList loadedPlugins( const TQString &category = TQString() ) const; /** * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name in diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 6e9072d0..c9805f9a 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -90,7 +90,7 @@ void KopetePrefs::load() mBgOverride = config->readBoolEntry("ChatView Override Background", false); mFgOverride = config->readBoolEntry("ChatView Override Foreground", false); mRtfOverride = config->readBoolEntry("ChatView Override RTF", false); - mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") ); + mInterfacePreference = config->readEntry("View Plugin", TQString::tqfromLatin1("kopete_chatwindow") ); tmpColor = KGlobalSettings::textColor(); mTextColor = config->readColorEntry("Text Color", &tmpColor ); tmpColor = KGlobalSettings::baseColor(); @@ -112,29 +112,29 @@ void KopetePrefs::load() if(mToolTipContents.empty()) { mToolTipContents - << TQString::fromLatin1("FormattedName") - << TQString::fromLatin1("userInfo") - << TQString::fromLatin1("server") - << TQString::fromLatin1("channels") - << TQString::fromLatin1("FormattedIdleTime") - << TQString::fromLatin1("channelMembers") - << TQString::fromLatin1("channelTopic") - << TQString::fromLatin1("emailAddress") - << TQString::fromLatin1("homePage") - << TQString::fromLatin1("onlineSince") - << TQString::fromLatin1("lastOnline") - << TQString::fromLatin1("awayMessage"); + << TQString::tqfromLatin1("FormattedName") + << TQString::tqfromLatin1("userInfo") + << TQString::tqfromLatin1("server") + << TQString::tqfromLatin1("channels") + << TQString::tqfromLatin1("FormattedIdleTime") + << TQString::tqfromLatin1("channelMembers") + << TQString::tqfromLatin1("channelTopic") + << TQString::tqfromLatin1("emailAddress") + << TQString::tqfromLatin1("homePage") + << TQString::tqfromLatin1("onlineSince") + << TQString::tqfromLatin1("lastOnline") + << TQString::tqfromLatin1("awayMessage"); } config->setGroup("ContactList"); setThemeURL(config->readEntry("ThemeURL")); - int n = metaObject()->findProperty( "contactListDisplayMode" ); - TQString value = config->readEntry("DisplayMode",TQString::fromLatin1("Default")); - mContactListDisplayMode = (ContactDisplayMode)metaObject()->property( n )->keyToValue( value.latin1() ); - n = metaObject()->findProperty( "contactListIconMode" ); + int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default")); + mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() ); + n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); value = config->readEntry("IconMode", - TQString::fromLatin1("IconDefault")); - mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() ); + TQString::tqfromLatin1("IconDefault")); + mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() ); mContactListIndentContacts = config->readBoolEntry("IndentContacts", false); mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false); TQFont font = KGlobalSettings::generalFont(); @@ -229,10 +229,10 @@ void KopetePrefs::save() config->setGroup("ContactList"); config->writeEntry("ThemeURL", mThemeURL); - int n = metaObject()->findProperty( "contactListDisplayMode" ); - config->writeEntry("DisplayMode", metaObject()->property( n )->valueToKey( mContactListDisplayMode )); - n = metaObject()->findProperty( "contactListIconMode" ); - config->writeEntry("IconMode", metaObject()->property( n )->valueToKey( mContactListIconMode )); + int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode )); + n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode )); config->writeEntry("IndentContacts", mContactListIndentContacts); config->writeEntry("UseCustomFonts", mContactListUseCustomFonts); config->writeEntry("GroupFont", mContactListGroupFont); @@ -439,7 +439,7 @@ void KopetePrefs::_setStylePath(const TQString &stylePath) if( !TQFile::exists(stylePath) || stylePath.isEmpty() ) { TQString fallback; - fallback = TQString(TQString::fromLatin1("styles/%1/")).arg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE)); + fallback = TQString(TQString::tqfromLatin1("styles/%1/")).tqarg(TQString::tqfromLatin1(KOPETE_DEFAULT_CHATSTYLE)); mStylePath = locate("appdata", fallback); } } diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h index dede4664..c2d6e291 100644 --- a/kopete/libkopete/kopeteprefs.h +++ b/kopete/libkopete/kopeteprefs.h @@ -26,12 +26,13 @@ class KConfig; -class KOPETE_EXPORT KopetePrefs : public QObject +class KOPETE_EXPORT KopetePrefs : public TQObject { Q_OBJECT - // here so we can use Qt to translate enums<-->strings - Q_PROPERTY( ContactDisplayMode contactListDisplayMode READ contactListDisplayMode WRITE setContactListDisplayMode ) - Q_PROPERTY( IconDisplayMode contactListIconMode READ contactListIconMode WRITE setContactListIconMode ) + TQ_OBJECT + // here so we can use TQt to translate enums<-->strings + TQ_PROPERTY( ContactDisplayMode contactListDisplayMode READ contactListDisplayMode WRITE setContactListDisplayMode ) + TQ_PROPERTY( IconDisplayMode contactListIconMode READ contactListIconMode WRITE setContactListIconMode ) Q_ENUMS( ContactDisplayMode IconDisplayMode ) public: @@ -100,7 +101,7 @@ public: int chatWindowPolicy() const { return mChatWindowPolicy; } //Styles - TQString defaultTheme() const { return TQString::fromLatin1("Default"); } + TQString defaultTheme() const { return TQString::tqfromLatin1("Default"); } //for Adium (xhtml+css) TQString stylePath() const { return mStylePath; } TQString styleVariant() const { return mStyleVariant; } diff --git a/kopete/libkopete/kopeteproperties.h b/kopete/libkopete/kopeteproperties.h index e40a9280..a73a10c7 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 parent. + * Returns the value of this property in the object @p tqparent. */ - virtual Type get( const Parent *parent ) const = 0; + virtual Type get( const Parent *tqparent ) const = 0; /** - * Sets the value of this property in the object @p parent. + * Sets the value of this property in the object @p tqparent. */ 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 parent objects. + * Some property objects want to store property-specific data in their tqparent 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 @@ -137,7 +137,7 @@ public: * name their custom data differently. Names are bound by the same rules as are laid out * for naming properties in PropertyBase<Parent>::name. */ - void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.replace( name, data ); } + void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.tqreplace( name, data ); } /** * Gets the stored property data with name @p name. Returns a null @@ -309,7 +309,7 @@ void variantToXML(TQVariant v, TQDomElement &); */ /** - * @brief Convenience implementation of XMLSerializable in terms of QVariants + * @brief Convenience implementation of XMLSerializable in terms of TQVariants * * This class provides XML serialization for data that can be stored in a TQVariant. You * will need to multiply-inherit from this class and (usually indirectly) from @ref Property. diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index e361abf6..3677cbe3 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -47,18 +47,18 @@ public: ContactPropertyTmpl mStickLastSeen; ContactPropertyTmpl mStickFullName; - Kopete::OnlineStatus accountNotConnectedStatus; + Kopete::OnlineStatus accountNotConnectedtqStatus; }; -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) -: Plugin( instance, parent, name ) +Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) +: Plugin( instance, tqparent, name ) { d = new Private; d->mStickLastSeen = Global::Properties::self()->lastSeen(); d->mStickFullName = Global::Properties::self()->fullName(); d->unloading = false; d->capabilities = 0; - d->accountNotConnectedStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::fromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); + d->accountNotConnectedtqStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::tqfromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); } Protocol::~Protocol() @@ -87,9 +87,9 @@ void Protocol::setCapabilities( unsigned int capabilities ) } -Kopete::OnlineStatus Protocol::accountOfflineStatus() const +Kopete::OnlineStatus Protocol::accountOfflinetqStatus() const { - return d->accountNotConnectedStatus; + return d->accountNotConnectedtqStatus; } void Protocol::slotAccountOnlineStatusChanged( Contact *self ) @@ -174,11 +174,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Preset the contactId and displayName, if the plugin doesn't want to save // them, or use its own format, it can call clear() on the provided list - sd[ TQString::fromLatin1( "contactId" ) ] = c->contactId(); + sd[ TQString::tqfromLatin1( "contactId" ) ] = c->contactId(); //TODO(nick) remove - sd[ TQString::fromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); + sd[ TQString::tqfromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); if(c->account()) - sd[ TQString::fromLatin1( "accountId" ) ] = c->account()->accountId(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = c->account()->accountId(); // If there's an index field preset it too TQString index = c->protocol()->addressBookIndexField(); @@ -193,11 +193,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) { // The Unicode chars E000-F800 are non-printable and reserved for // private use in applications. For more details, see also - // http://www.unicode.org/charts/PDF/UE000.pdf. + // http://www.tqunicode.org/charts/PDF/UE000.pdf. // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. - if( serializedData.contains( it.key() ) ) + if( serializedData.tqcontains( it.key() ) ) serializedData[ it.key() ] = serializedData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else serializedData[ it.key() ] = it.data(); @@ -205,7 +205,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) for( it = ad.begin(); it != ad.end(); ++it ) { - if( addressBookData.contains( it.key() ) ) + if( addressBookData.tqcontains( it.key() ) ) addressBookData[ it.key() ] = addressBookData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else addressBookData[ it.key() ] = it.data(); @@ -226,13 +226,13 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // we can devise a better API, but with the constantly changing // requirements every time I learn more about kabc I'd better no touch // the API yet - Martijn - if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) ) + if( it.key().startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - metaContact->setAddressBookField( this, it.key(), TQString::fromLatin1( "All" ), it.data() ); + metaContact->setAddressBookField( this, it.key(), TQString::tqfromLatin1( "All" ), it.data() ); // kdDebug(14010) << k_funcinfo << "metaContact->setAddressBookField( " << this << ", " << it.key() << ", \"All\", " << it.data() << " );" << endl; } else - metaContact->setAddressBookField( this, TQString::fromLatin1( "kopete" ), it.key(), it.data() ); + metaContact->setAddressBookField( this, TQString::tqfromLatin1( "kopete" ), it.key(), it.data() ); } } @@ -250,7 +250,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt serializedDataIterators[ it.key() ] = serializedData[ it.key() ].begin(); } - uint count = serializedData[TQString::fromLatin1("contactId")].count(); + uint count = serializedData[TQString::tqfromLatin1("contactId")].count(); // Prepare the independent entries to pass to the plugin's implementation for( uint i = 0; i < count ; i++ ) @@ -263,11 +263,11 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt ++( serializedDataIt.data() ); } - const TQString& accountId=sd[ TQString::fromLatin1( "accountId" ) ]; + const TQString& accountId=sd[ TQString::tqfromLatin1( "accountId" ) ]; // myself was allowed in the contactlist in old version of kopete. // But if one keep it on the contactlist now, it may conflict witht he myself metacontact. // So ignore it - if(accountId == sd[ TQString::fromLatin1( "contactId" ) ] ) + if(accountId == sd[ TQString::tqfromLatin1( "contactId" ) ] ) { kdDebug( 14010 ) << k_funcinfo << "Myself contact was on the contactlist.xml for account " << accountId << ". Ignore it" << endl; continue; @@ -290,10 +290,10 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt // hack in the serialize code. // Once this code is actually capable of talking to kabc this hack // should be removed ASAP! - Martijn - if( ( *fieldIt ).startsWith( TQString::fromLatin1( "messaging/" ) ) ) - ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) ); + if( ( *fieldIt ).startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) + ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::tqfromLatin1( "All" ) ); else - ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::fromLatin1( "kopete" ), *fieldIt ); + ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::tqfromLatin1( "kopete" ), *fieldIt ); } // Check if we have an account id. If not we're deserializing a Kopete 0.6 contact @@ -305,7 +305,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt TQDict<Account> accounts = AccountManager::self()->accounts( this ); if ( accounts.count() > 0 ) { - sd[ TQString::fromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); } else { diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index 546247cf..64cab27c 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -58,6 +58,7 @@ class Account; class KOPETE_EXPORT Protocol : public Plugin { Q_OBJECT + TQ_OBJECT public: @@ -85,7 +86,7 @@ public: * * @return A new AddContactPage to be shown in the Add Contact Wizard */ - virtual AddContactPage *createAddContactWidget( TQWidget *parent, Account *account ) = 0; + virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Account *account ) = 0; /** * @brief Create a new KopeteEditAccountWidget @@ -93,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 parent The parent of the 'to be returned' widget + * @param tqparent The tqparent of the 'to be returned' widget */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *parent ) = 0; + virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *tqparent ) = 0; /** - * @brief a bitmask of the capabilities of this protocol + * @brief a bittqmask of the capabilities of this protocol * @sa @ref setCapabilities */ unsigned int capabilities() const ; @@ -131,7 +132,7 @@ public: RichIFormatting = 0x400, RichBFormatting = 0x800, - Alignment = 0x1000, ///< Setting the alignment of text portions + Alignment = 0x1000, ///< Setting the tqalignment of text portions /// Setting the formatting of the whole edit widget / message BaseFormatting = BaseIFormatting | BaseUFormatting | BaseBFormatting, @@ -152,7 +153,7 @@ public: /** * @brief Returns the status used for contacts when accounts of this protocol are offline */ - Kopete::OnlineStatus accountOfflineStatus() const; + Kopete::OnlineStatus accountOfflinetqStatus() const; protected: @@ -160,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 parent The protocol's parent object + * @param tqparent The protocol's tqparent object * @param name The protocol's name */ - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( KInstance *instance, TQObject *tqparent, const char *name ); /** * @brief Sets the capabilities of this protcol. diff --git a/kopete/libkopete/kopetesimplemessagehandler.h b/kopete/libkopete/kopetesimplemessagehandler.h index 9a5fd296..b165dbb0 100644 --- a/kopete/libkopete/kopetesimplemessagehandler.h +++ b/kopete/libkopete/kopetesimplemessagehandler.h @@ -69,6 +69,7 @@ private: class SimpleMessageHandler : public MessageHandler { Q_OBJECT + TQ_OBJECT public: SimpleMessageHandler(); ~SimpleMessageHandler(); diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h index 5457e1ba..d669d68b 100644 --- a/kopete/libkopete/kopetetask.h +++ b/kopete/libkopete/kopetetask.h @@ -45,9 +45,10 @@ namespace Kopete * class come from KIO::Job. * @author Richard Smith <kde@metafoo.co.uk> */ -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT protected: Task(); @@ -135,7 +136,7 @@ protected: * Sets the stored result and error message to @p result and @p errorMessage. * You should call this instead of emitting the result() signal yourself. */ - void emitResult( Result result = ResultSucceeded, const TQString &errorMessage = TQString::null ); + void emitResult( Result result = ResultSucceeded, const TQString &errorMessage = TQString() ); protected slots: /** diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 67f2d04f..91ca9b27 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -84,11 +84,11 @@ Kopete::Transfer::~Transfer() KURL Kopete::Transfer::displayURL( const Kopete::Contact *contact, const TQString &file ) { KURL url; - url.setProtocol( TQString::fromLatin1("kopete") ); + url.setProtocol( TQString::tqfromLatin1("kopete") ); TQString host; if( !contact ) - host = TQString::fromLatin1("unknown origin"); + host = TQString::tqfromLatin1("unknown origin"); else if( contact->metaContact() ) host = contact->metaContact()->displayName(); else @@ -158,7 +158,7 @@ Kopete::TransferManager* Kopete::TransferManager::transferManager() return s_transferManager; } -Kopete::TransferManager::TransferManager( TQObject *parent ) : TQObject( parent ) +Kopete::TransferManager::TransferManager( TQObject *tqparent ) : TQObject( tqparent ) { nextID = 0; } @@ -234,7 +234,7 @@ void Kopete::TransferManager::sendFile( const KURL &file, const TQString &fname, //If the file location is null, then get it from a file open dialog if( !url.isValid() ) - url = KFileDialog::getOpenURL( TQString::null, TQString::fromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); + url = KFileDialog::getOpenURL( TQString(), TQString::tqfromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); else { filename = fname; diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index 53b2711f..30906b97 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -40,7 +40,7 @@ class KOPETE_EXPORT FileTransferInfo public: enum KopeteTransferDirection { Incoming, Outgoing }; - FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString::null); + FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString()); ~FileTransferInfo() {} unsigned int transferId() const { return mId; } const Contact* contact() const { return mContact; } @@ -63,9 +63,10 @@ private: /** * Creates and manages kopete file transfers */ -class KOPETE_EXPORT TransferManager : public QObject +class KOPETE_EXPORT TransferManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -78,7 +79,7 @@ public: * @brief Adds a file transfer to the Kopete::TransferManager */ Transfer *addTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString &recipient , FileTransferInfo::KopeteTransferDirection di); - int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString::null, TQString internalId=TQString::null); + int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString(), TQString internalId=TQString()); void removeTransfer( unsigned int id ); /** @@ -120,7 +121,7 @@ private slots: void slotComplete(KIO::Job*); private: - TransferManager( TQObject *parent ); + TransferManager( TQObject *tqparent ); static TransferManager *s_transferManager; int nextID; @@ -134,6 +135,7 @@ private: class KOPETE_EXPORT Transfer : public KIO::Job { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/libkopete/kopeteuiglobal.h b/kopete/libkopete/kopeteuiglobal.h index 7db34189..c23bc99b 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 parent. + * and KNotify stuff should use as a tqparent. */ KOPETE_EXPORT TQWidget *mainWidget(); diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp index 6fe46529..b06082ee 100644 --- a/kopete/libkopete/kopeteutils.cpp +++ b/kopete/libkopete/kopeteutils.cpp @@ -69,7 +69,7 @@ void notifyConnectionLost( const Account *account, const TQString &caption, cons if (!account) return; - notify( account->accountIcon(32), TQString::fromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); } bool isHostReachable(const TQString &host) @@ -98,7 +98,7 @@ void notifyCannotConnect( const Account *account, const TQString &explanation, c if (!account) return; - notify( account->accountIcon(), TQString::fromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); + notify( account->accountIcon(), TQString::tqfromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); } void notifyConnectionError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -107,7 +107,7 @@ void notifyConnectionError( const Account *account, const TQString &caption, con return; // TODO: Display a specific default connection error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::fromLatin1("connection_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("connection_error"), caption, message, explanation, debugInfo); } void notifyServerError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -116,7 +116,7 @@ void notifyServerError( const Account *account, const TQString &caption, const T return; // TODO: Display a specific default server error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::fromLatin1("server_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("server_error"), caption, message, explanation, debugInfo); } } // end ns ErrorNotifier diff --git a/kopete/libkopete/kopeteutils.h b/kopete/libkopete/kopeteutils.h index c90ba054..3221827b 100644 --- a/kopete/libkopete/kopeteutils.h +++ b/kopete/libkopete/kopeteutils.h @@ -53,10 +53,10 @@ bool isHostReachable( const TQString &host ); * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyConnectionLost( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); /** @@ -70,8 +70,8 @@ void KOPETE_EXPORT notifyConnectionLost( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyCannotConnect( const Account *account, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null); + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString()); /** * Notifies the user that an error on a connection occcured without coupling plugins with GUI code. @@ -86,10 +86,10 @@ void KOPETE_EXPORT notifyCannotConnect( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyConnectionError( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); /** * Notifies the user that an error on the server occcured without coupling plugins with GUI code. @@ -104,10 +104,10 @@ void KOPETE_EXPORT notifyConnectionError( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyServerError( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); } // end ns Utils } // end ns Kopete diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index f17c73b8..b7796abc 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -87,7 +87,7 @@ void Kopete::WalletManager::openWalletInner() // do we already have a wallet? if ( d->wallet ) { - // if the wallet isn't open yet, we're pending a slotWalletChangedStatus + // if the wallet isn't open yet, we're pending a slotWalletChangedtqStatus // anyway, so we don't set up a single shot. if ( d->wallet->isOpen() ) { @@ -107,19 +107,19 @@ void Kopete::WalletManager::openWalletInner() d->wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), mainWindowID(), KWallet::Wallet::Asynchronous ); - connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedStatus() ) ); + connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedtqStatus() ) ); } -void Kopete::WalletManager::slotWalletChangedStatus() +void Kopete::WalletManager::slotWalletChangedtqStatus() { kdDebug(14010) << k_funcinfo << " isOpen: " << d->wallet->isOpen() << endl; if( d->wallet->isOpen() ) { - if ( !d->wallet->hasFolder( TQString::fromLatin1( "Kopete" ) ) ) - d->wallet->createFolder( TQString::fromLatin1( "Kopete" ) ); + if ( !d->wallet->hasFolder( TQString::tqfromLatin1( "Kopete" ) ) ) + d->wallet->createFolder( TQString::tqfromLatin1( "Kopete" ) ); - if ( d->wallet->setFolder( TQString::fromLatin1( "Kopete" ) ) ) + if ( d->wallet->setFolder( TQString::tqfromLatin1( "Kopete" ) ) ) { // success! TQObject::connect( d->wallet, TQT_SIGNAL( walletClosed() ), this, TQT_SLOT( closeWallet() ) ); diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h index a9ed0971..05680b17 100644 --- a/kopete/libkopete/kopetewalletmanager.h +++ b/kopete/libkopete/kopetewalletmanager.h @@ -34,9 +34,10 @@ namespace Kopete * The Kopete::WalletManager class is a singleton, which looks after Kopete's * KWallet connection. */ -class KOPETE_EXPORT WalletManager : public QObject +class KOPETE_EXPORT WalletManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -79,7 +80,7 @@ private slots: * * Causes walletOpened to be emitted. */ - void slotWalletChangedStatus(); + void slotWalletChangedtqStatus(); /** * Called by a singleShot timer in the event that we are asked for a @@ -102,9 +103,10 @@ private: /** * @internal */ -class KopeteWalletSignal : public QObject +class KopeteWalletSignal : public TQObject { Q_OBJECT + TQ_OBJECT friend class Kopete::WalletManager; signals: void walletOpened( KWallet::Wallet *wallet ); diff --git a/kopete/libkopete/managedconnectionaccount.cpp b/kopete/libkopete/managedconnectionaccount.cpp index cf14ed2f..05dbf9cf 100644 --- a/kopete/libkopete/managedconnectionaccount.cpp +++ b/kopete/libkopete/managedconnectionaccount.cpp @@ -24,48 +24,48 @@ namespace Kopete { -ManagedConnectionAccount::ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength, const char *name ) - : PasswordedAccount( parent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) +ManagedConnectionAccount::ManagedConnectionAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength, const char *name ) + : PasswordedAccount( tqparent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) { - TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus ) ), - TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworkStatus::EnumStatus ) ) ); + TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ), + TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ) ); } void ManagedConnectionAccount::connectWithPassword( const TQString &password ) { m_password = password; - NetworkStatus::EnumStatus status = ConnectionManager::self()->status( TQString::null ); - if ( status == NetworkStatus::NoNetworks ) + NetworktqStatus::EnumtqStatus status = ConnectionManager::self()->status( TQString() ); + if ( status == NetworktqStatus::NoNetworks ) performConnectWithPassword( password ); else { m_waitingForConnection = true; // need to adapt libkopete so we know the hostname in this class and whether the connection was user initiated // for now, these are the default parameters to always bring up a connection to "the internet". - NetworkStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString::null, true ); - if ( response == NetworkStatus::Connected ) + NetworktqStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString(), true ); + if ( response == NetworktqStatus::Connected ) { m_waitingForConnection = false; performConnectWithPassword( password ); } - else if ( response == NetworkStatus::UserRefused || response == NetworkStatus::Unavailable ) + else if ( response == NetworktqStatus::UserRefused || response == NetworktqStatus::Unavailable ) disconnect(); } } -void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ) +void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ) { Q_UNUSED(host); // as above, we didn't register a hostname, so treat any connection as our own. - if ( m_waitingForConnection && ( status == NetworkStatus::Online || status == NetworkStatus::NoNetworks ) ) + if ( m_waitingForConnection && ( status == NetworktqStatus::Online || status == NetworktqStatus::NoNetworks ) ) { m_waitingForConnection = false; performConnectWithPassword( m_password ); } - else if ( isConnected() && ( status == NetworkStatus::Offline - || status == NetworkStatus::ShuttingDown - || status == NetworkStatus::OfflineDisconnected - || status == NetworkStatus::OfflineFailed ) ) + else if ( isConnected() && ( status == NetworktqStatus::Offline + || status == NetworktqStatus::ShuttingDown + || status == NetworktqStatus::OfflineDisconnected + || status == NetworktqStatus::OfflineFailed ) ) disconnect(); } diff --git a/kopete/libkopete/managedconnectionaccount.h b/kopete/libkopete/managedconnectionaccount.h index 7d864dfc..1de3a7ad 100644 --- a/kopete/libkopete/managedconnectionaccount.h +++ b/kopete/libkopete/managedconnectionaccount.h @@ -27,7 +27,7 @@ namespace Kopete class Protocol; /** - * A ManagedConnectionAccount queries the NetworkStatus KDED Module before trying to connect using + * A ManagedConnectionAccount queries the NetworktqStatus KDED Module before trying to connect using * connectwithPassword, starting a network connection if needed. If the network is not available, * it delays calling performConnectWithPassword until it receives notification from the daemon * that the network is up. The account receiveds notifications from the daemon of network failures @@ -36,15 +36,16 @@ class Protocol; class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount { Q_OBJECT + TQ_OBJECT public: /** * @brief ManagedConnectionAccount constructor. - * @param parent The protocol this account connects via + * @param tqparent 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 QObject + * @param name The name for this TQObject */ - ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + ManagedConnectionAccount( Protocol *tqparent, 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. @@ -68,7 +69,7 @@ class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount * @param host For future expansion. * @param status the new status of the network */ - virtual void slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ); + virtual void slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); private: TQString m_password; bool m_waitingForConnection; diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index 87c18a14..acf53f96 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -1,32 +1,32 @@ #include "networkstatuscommon.h" #include <kdebug.h> -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) +TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ) { kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl; s << (int)p.status; s << (int)p.onDemandPolicy; s << p.service; s << ( p.internet ? 1 : 0 ); - s << p.netmasks; + s << p.nettqmasks; return s; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) +TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) { int status, onDemandPolicy, internet; s >> status; kdDebug() << k_funcinfo << "status is: " << status << endl; - p.status = ( NetworkStatus::EnumStatus )status; + p.status = ( NetworktqStatus::EnumtqStatus )status; s >> onDemandPolicy; - p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy; + p.onDemandPolicy = ( NetworktqStatus::EnumOnDemandPolicy )onDemandPolicy; s >> p.service; s >> internet; if ( internet ) p.internet = true; else p.internet = false; - s >> p.netmasks; + s >> p.nettqmasks; kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl; return s; } diff --git a/kopete/libkopete/networkstatuscommon.h b/kopete/libkopete/networkstatuscommon.h index a243be43..81ac8350 100644 --- a/kopete/libkopete/networkstatuscommon.h +++ b/kopete/libkopete/networkstatuscommon.h @@ -3,31 +3,31 @@ #include <tqstringlist.h> -namespace NetworkStatus +namespace NetworktqStatus { - enum EnumStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; + enum EnumtqStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; enum EnumRequestResult { RequestAccepted = 1, Connected, UserRefused, Unavailable }; enum EnumOnDemandPolicy { All, User, None, Permanent }; struct Properties { TQString name; // status of the network - EnumStatus status; + EnumtqStatus status; // policy for on-demand usage as defined by the service EnumOnDemandPolicy onDemandPolicy; // identifier for the service TQCString service; // indicate that the connection is to 'the internet' - similar to default gateway in routing bool internet; - // list of netmasks that the network connects to - overridden by above internet - TQStringList netmasks; + // list of nettqmasks that the network connects to - overridden by above internet + TQStringList nettqmasks; // for future expansion consider // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged - // EnumLinkStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT + // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT }; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ); -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ); +TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ); +TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ); #endif diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 1f8969f6..f9fef1b6 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -25,11 +25,11 @@ #include "kopetecommand.h" #include "kopeteuiglobal.h" -Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot, +Kopete::Command::Command( TQObject *tqparent, 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, parent, - ( command.lower() + TQString::fromLatin1("_command") ).latin1() ) + : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, tqparent, + ( 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 *) ), - parent(), slot ); + tqparent(), slot ); } TQObject::connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotAction() ) ); @@ -61,7 +61,7 @@ void Kopete::Command::slotAction() TQString args; if( m_minArgs > 0 ) { - args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").arg(m_command) ); + args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").tqarg(m_command) ); if( args.isNull() ) return; } @@ -74,23 +74,23 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession TQStringList mArgs = Kopete::CommandHandler::parseArguments( args ); if( m_processing ) { - printError( i18n("Alias \"%1\" expands to itself.").arg( text() ), manager, gui ); + printError( i18n("Alias \"%1\" expands to itself.").tqarg( text() ), manager, gui ); } else if( mArgs.count() < m_minArgs ) { printError( i18n("\"%1\" requires at least %n argument.", "\"%1\" requires at least %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( m_maxArgs > -1 && (int)mArgs.count() > m_maxArgs ) { printError( i18n("\"%1\" has a maximum of %n argument.", "\"%1\" has a maximum of %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( !KApplication::kApplication()->authorizeKAction( name() ) ) { - printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui ); + printError( i18n("You are not authorized to perform the command \"%1\".").tqarg(text()), manager, gui ); } else { @@ -102,20 +102,20 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.replace( TQString::fromLatin1("%n"), manager->myself()->nickName() ); - formatString.replace( TQString::fromLatin1("%s"), args ); + formatString.tqreplace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.tqreplace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN while( mArgs.count() > 0 ) { - formatString = formatString.arg( mArgs.front() ); + formatString = formatString.tqarg( mArgs.front() ); mArgs.pop_front(); } kdDebug(14010) << "New Command after processing alias: " << formatString << endl; - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/") + formatString, manager ); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/") + formatString, manager ); } else { diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h index 6a686f1e..d49de208 100644 --- a/kopete/libkopete/private/kopetecommand.h +++ b/kopete/libkopete/private/kopetecommand.h @@ -30,12 +30,13 @@ class ChatSession; class Command : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Creates a Kopete::Command object * - * @param parent The plugin who owns this command + * @param tqparent 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 @@ -49,10 +50,10 @@ class Command : public KAction * @param cut The shortcut for the command * @param pix The icon to use for the command */ - Command( TQObject *parent, const TQString &command, const char* handlerSlot, - const TQString &help = TQString::null, CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString::null, + Command( TQObject *tqparent, 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::null ); + const TQString &pix = TQString() ); /** * Process this command diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index a2d33341..1edede5d 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -52,7 +52,7 @@ struct Emoticons::Emoticon bool operator< (const Emoticon &e){ return matchText.length() > e.matchText.length(); } TQString matchText; TQString matchTextEscaped; - QString picPath; + TQString picPath; TQString picHTMLCode; }; @@ -183,7 +183,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint p = c; continue; } /* strict requires space before the emoticon */ - if ( d->emoticonMap.contains( c ) ) + if ( d->emoticonMap.tqcontains( c ) ) { emoticonList = d->emoticonMap[ c ]; bool found = false; @@ -192,7 +192,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint // If this is an HTML, then search for the HTML form of the emoticon. // For instance <o) => >o) needle = ( mode & SkipHTML ) ? (*it).matchTextEscaped : (*it).matchText; - if ( ( pos == (size_t)message.find( needle, pos ) ) ) + if ( ( pos == (size_t)message.tqfind( needle, pos ) ) ) { if( mode & StrictParse ) { @@ -214,11 +214,11 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint { if( inHTMLEntity ){ // If we are in an HTML entitiy such as > - int htmlEnd = message.find( ';', pos ); + int htmlEnd = message.tqfind( ';', pos ); // Search for where it ends if( htmlEnd == -1 ) { - // Apparently this HTML entity isn't ended, something is wrong, try skip the '&' + // Aptqparently this HTML entity isn't ended, something is wrong, try skip the '&' // and continue kdDebug( 14000 ) << k_funcinfo << "Broken HTML entity, trying to recover." << endl; inHTMLEntity = false; @@ -300,14 +300,14 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList TQString pic; //maybe an extension was given, so try to find the exact file - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt ); if( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".mng" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".mng" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".png" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".png" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".gif" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".gif" ) ); if( !pic.isNull() ) // only add if we found one file { @@ -328,15 +328,15 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList // Unless we do so, ChatMessagePart::slotScrollView does not work properly and causing // HTMLPart not to be scrolled to the very last message. p.load( e.picPath ); - result = TQString::fromLatin1( "<img align=\"center\" src=\"" ) + + result = TQString::tqfromLatin1( "<img align=\"center\" src=\"" ) + e.picPath + - TQString::fromLatin1( "\" title=\"" ) + + TQString::tqfromLatin1( "\" title=\"" ) + matchEscaped + - TQString::fromLatin1( "\" width=\"" ) + + TQString::tqfromLatin1( "\" width=\"" ) + TQString::number( p.width() ) + - TQString::fromLatin1( "\" height=\"" ) + + TQString::tqfromLatin1( "\" height=\"" ) + TQString::number( p.height() ) + - TQString::fromLatin1( "\" />" ); + TQString::tqfromLatin1( "\" />" ); e.picHTMLCode = result; e.matchTextEscaped = matchEscaped; @@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme ) d->emoticonAndPicList.clear(); d->emoticonMap.clear(); - TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); + TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/emoticons.xml" ) ); if(!filename.isEmpty()) return initEmoticon_emoticonsxml( filename ); - filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); + filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/icondef.xml" ) ); if(!filename.isEmpty()) return initEmoticon_JEP0038( filename ); kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl; @@ -376,7 +376,7 @@ void Emoticons::initEmoticons( const TQString &theme ) void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) { - TQDomDocument emoticonMap( TQString::fromLatin1( "messaging-emoticon-map" ) ); + TQDomDocument emoticonMap( TQString::tqfromLatin1( "messaging-emoticon-map" ) ); TQFile mapFile( filename ); mapFile.open( IO_ReadOnly ); @@ -389,10 +389,10 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) TQDomElement element = node.toElement(); if( !element.isNull() ) { - if( element.tagName() == TQString::fromLatin1( "emoticon" ) ) + if( element.tagName() == TQString::tqfromLatin1( "emoticon" ) ) { TQString emoticon_file = element.attribute( - TQString::fromLatin1( "file" ), TQString::null ); + TQString::tqfromLatin1( "file" ), TQString() ); TQStringList items; TQDomNode emoticonNode = node.firstChild(); @@ -401,7 +401,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) TQDomElement emoticonElement = emoticonNode.toElement(); if( !emoticonElement.isNull() ) { - if( emoticonElement.tagName() == TQString::fromLatin1( "string" ) ) + if( emoticonElement.tagName() == TQString::tqfromLatin1( "string" ) ) { items << emoticonElement.text(); } @@ -432,7 +432,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) void Emoticons::initEmoticon_JEP0038( const TQString & filename) { - TQDomDocument emoticonMap( TQString::fromLatin1( "icondef" ) ); + TQDomDocument emoticonMap( TQString::tqfromLatin1( "icondef" ) ); TQFile mapFile( filename ); mapFile.open( IO_ReadOnly ); @@ -445,7 +445,7 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename) TQDomElement element = node.toElement(); if( !element.isNull() ) { - if( element.tagName() == TQString::fromLatin1( "icon" ) ) + if( element.tagName() == TQString::tqfromLatin1( "icon" ) ) { TQStringList items; TQString emoticon_file; @@ -456,16 +456,16 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename) TQDomElement emoticonElement = emoticonNode.toElement(); if( !emoticonElement.isNull() ) { - if( emoticonElement.tagName() == TQString::fromLatin1( "text" ) ) + if( emoticonElement.tagName() == TQString::tqfromLatin1( "text" ) ) { //TODO xml:lang items << emoticonElement.text(); } - else if( emoticonElement.tagName() == TQString::fromLatin1( "object" ) && emoticon_file.isEmpty() ) + else if( emoticonElement.tagName() == TQString::tqfromLatin1( "object" ) && emoticon_file.isEmpty() ) { TQString mime= emoticonElement.attribute( - TQString::fromLatin1( "mime" ), TQString::fromLatin1("image/*") ); - if(mime.startsWith(TQString::fromLatin1("image/")) && !mime.endsWith(TQString::fromLatin1("/svg+xml"))) + TQString::tqfromLatin1( "mime" ), TQString::tqfromLatin1("image/*") ); + if(mime.startsWith(TQString::tqfromLatin1("image/")) && !mime.endsWith(TQString::tqfromLatin1("/svg+xml"))) { emoticon_file = emoticonElement.text(); } diff --git a/kopete/libkopete/private/kopeteemoticons.h b/kopete/libkopete/private/kopeteemoticons.h index 762a02a0..d9353189 100644 --- a/kopete/libkopete/private/kopeteemoticons.h +++ b/kopete/libkopete/private/kopeteemoticons.h @@ -26,16 +26,17 @@ namespace Kopete { -class KOPETE_EXPORT Emoticons : public QObject +class KOPETE_EXPORT Emoticons : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor: DON'T use it if you want to use the emoticon theme * chosen by the user. * Instead, use @ref Kopete::Emoticons::self() **/ - Emoticons( const TQString &theme = TQString::null ); + Emoticons( const TQString &theme = TQString() ); ~Emoticons( ); @@ -88,9 +89,9 @@ public: Token( TokenType t, const TQString &m, const TQString &p, const TQString &html ) : type( t ), text( m ), picPath( p ), picHTMLCode( html ) {} TokenType type; - QString text; - QString picPath; - QString picHTMLCode; + TQString text; + TQString picPath; + TQString picHTMLCode; }; @@ -119,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 bitmask of ParseMode enum + * @param mode is a bittqmask of ParseMode enum * @return a TQValueList which consiste of ordered tokens of the text. * @author Engin AYDOGAN < engin@bzzzt.biz > * @since 23-03-05 @@ -180,7 +181,7 @@ private slots: * Fills the map with paths and emoticons * This needs to be done on every emoticon-theme change **/ - void initEmoticons ( const TQString &theme = TQString::null ); + void initEmoticons ( const TQString &theme = TQString() ); }; diff --git a/kopete/libkopete/private/kopeteutils_private.h b/kopete/libkopete/private/kopeteutils_private.h index 8c780c2f..4114e65f 100644 --- a/kopete/libkopete/private/kopeteutils_private.h +++ b/kopete/libkopete/private/kopeteutils_private.h @@ -37,9 +37,10 @@ typedef struct TQString debugInfo; } ErrorNotificationInfo; -class NotifyHelper : public QObject +class NotifyHelper : public TQObject { Q_OBJECT + TQ_OBJECT public: static NotifyHelper* self(); void registerNotification(const KNotification* event, ErrorNotificationInfo error); diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 2a6ccb84..4650ffb9 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -110,7 +110,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin { // kdDebug(14000) << k_funcinfo << endl; - if( d->managerMap.contains( session ) && d->managerMap[ session ] ) + if( d->managerMap.tqcontains( session ) && d->managerMap[ session ] ) { return d->managerMap[ session ]; } @@ -132,7 +132,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin } if( !viewPlugin ) - viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::fromLatin1("kopete_chatwindow") ); + viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::tqfromLatin1("kopete_chatwindow") ); if( viewPlugin ) { @@ -161,7 +161,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi bool outgoingMessage = ( msg.direction() == Kopete::Message::Outbound ); - if( !outgoingMessage || d->managerMap.contains( manager ) ) + if( !outgoingMessage || d->managerMap.tqcontains( manager ) ) { d->foreignMessage=!outgoingMessage; //let know for the view we are about to create manager->view(true,msg.requestedPlugin())->appendMessage( msg ); @@ -175,7 +175,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi // append msg event to queue if chat window is active but not the chat view in it... appendMessageEvent = appendMessageEvent && !(w->isActiveWindow() && manager->view() == d->activeView); // ...and chat window is on another desktop - appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->topLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); + appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->tqtopLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); } else { @@ -211,7 +211,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow()) && msg.from()) { - TQString msgFrom = TQString::null; + TQString msgFrom = TQString(); if( msg.from()->metaContact() ) msgFrom = msg.from()->metaContact()->displayName(); else @@ -219,7 +219,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi TQString msgText = msg.plainBody(); if( msgText.length() > 90 ) - msgText = msgText.left(88) + TQString::fromLatin1("..."); + msgText = msgText.left(88) + TQString::tqfromLatin1("..."); TQString event; TQString body =i18n( "<qt>Incoming message from %1<br>\"%2\"</qt>" ); @@ -227,16 +227,16 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi switch( msg.importance() ) { case Kopete::Message::Low: - event = TQString::fromLatin1( "kopete_contact_lowpriority" ); + event = TQString::tqfromLatin1( "kopete_contact_lowpriority" ); break; case Kopete::Message::Highlight: - event = TQString::fromLatin1( "kopete_contact_highlight" ); + event = TQString::tqfromLatin1( "kopete_contact_highlight" ); body = i18n( "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>" ); break; default: - event = TQString::fromLatin1( "kopete_contact_incoming" ); + event = TQString::tqfromLatin1( "kopete_contact_incoming" ); } - KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.arg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ + KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.tqarg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); connect(notify,TQT_SIGNAL(activated(unsigned int )), manager , TQT_SLOT(raiseView()) ); @@ -329,7 +329,7 @@ void KopeteViewManager::slotViewDestroyed( KopeteView *closingView ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.contains( closingView->msgManager() ) ) + if( d->managerMap.tqcontains( closingView->msgManager() ) ) { d->managerMap.remove( closingView->msgManager() ); // closingView->msgManager()->setCanBeDeleted( true ); @@ -343,7 +343,7 @@ void KopeteViewManager::slotChatSessionDestroyed( Kopete::ChatSession *manager ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.contains( manager ) ) + if( d->managerMap.tqcontains( manager ) ) { KopeteView *v=d->managerMap[ manager ]; v->closeView( true ); diff --git a/kopete/libkopete/private/kopeteviewmanager.h b/kopete/libkopete/private/kopeteviewmanager.h index f2302f6d..c1de7730 100644 --- a/kopete/libkopete/private/kopeteviewmanager.h +++ b/kopete/libkopete/private/kopeteviewmanager.h @@ -36,9 +36,10 @@ struct KopeteViewManagerPrivate; /** * Relates an actual chat to the means used to view it. */ -class KOPETE_EXPORT KopeteViewManager : public QObject +class KOPETE_EXPORT KopeteViewManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** This is a singleton class. Call this method to get a pointer to * a KopeteViewManager. @@ -54,7 +55,7 @@ class KOPETE_EXPORT KopeteViewManager : public QObject * @param session The Kopete::ChatSession we are viewing. * @param requestedPlugin Specifies the view plugin to use. */ - KopeteView *view( Kopete::ChatSession *session, const TQString &requestedPlugin = TQString::null ); + KopeteView *view( Kopete::ChatSession *session, const TQString &requestedPlugin = TQString() ); /** * Provide access to the list of KopeteChatWindow the class maintains. diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb index 7951bf35..ba6e0c2e 100755 --- a/kopete/libkopete/tests/create_test.rb +++ b/kopete/libkopete/tests/create_test.rb @@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,"")) fileCpp.gsub!(/Template/, className.gsub(/::/,"")) fileCpp.gsub!(/some requirement/, className + " class.") -makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" +makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../tqmock/libkopete_tqmock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" makefileAm.gsub!(/template/, className.downcase.gsub(/::/,"")) hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,"")) diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 7b21d407..933a67bb 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -36,7 +36,7 @@ void KopeteContactList_Test::testSomething() // change user data dir to avoid messing with user's .kde dir setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); - TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); if( ! filename.isEmpty() ) { // previous test run, delete the previous contact list diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index a64aee99..ab0ee31a 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -62,7 +62,7 @@ void KopeteEmoticonTest::allTests() void KopeteEmoticonTest::testEmoticonParser() { Kopete::Emoticons emo("Default"); - TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/emoticon-parser-testcases"); + TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/emoticon-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -71,10 +71,10 @@ void KopeteEmoticonTest::testEmoticonParser() TQString fileName = *it; kdDebug() << "testcase: " << fileName << endl; TQString outputFileName = fileName; - outputFileName.replace("input","output"); + outputFileName.tqreplace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -94,19 +94,19 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString::null ); + TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).tqreplace( "smile.png", TQString() ); Kopete::Emoticons::self(); - TQString result = emo.parse( inputData ).replace( path, TQString::null ); + TQString result = emo.parse( inputData ).tqreplace( path, TQString() ); // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::fromLatin1(": ") + result; - expectedData = fileName + TQString::fromLatin1(": ") + expectedData; + result = fileName + TQString::tqfromLatin1(": ") + result; + expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) { kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 3e4a85b3..55a44f87 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include "kopetemessage_test.h" -#include "kopeteaccount_mock.h" -#include "kopeteprotocol_mock.h" -#include "kopetecontact_mock.h" -#include "kopetemetacontact_mock.h" -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" +#include "kopeteprotocol_tqmock.h" +#include "kopetecontact_tqmock.h" +#include "kopetemetacontact_tqmock.h" +#include "kopeteaccount_tqmock.h" using namespace KUnitTest; @@ -57,9 +57,9 @@ KopeteMessage_Test::KopeteMessage_Test() m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount"); m_metaContactMyself = new Kopete::Test::Mock::MetaContact(); m_metaContactOther = new Kopete::Test::Mock::MetaContact(); - m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-myself"), m_metaContactMyself, TQString::null); - m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-dest"), m_metaContactOther, TQString::null); - m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString::null, Kopete::Message::Outbound, Kopete::Message::PlainText); + m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-myself"), m_metaContactMyself, TQString()); + m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-dest"), m_metaContactOther, TQString()); + m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString(), Kopete::Message::Outbound, Kopete::Message::PlainText); } void KopeteMessage_Test::allTests() @@ -67,7 +67,7 @@ void KopeteMessage_Test::allTests() KApplication::disableAutoDcopRegistration(); //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); - // At least Kopete::Message::asXML() seems to require that a QApplication + // At least Kopete::Message::asXML() seems to require that a TQApplication // is created. Running the console version doesn't create it, but the GUI // version does. @@ -227,7 +227,7 @@ void KopeteMessage_Test::testPrimitives() { Kopete::Message msg2; - CHECK(msg2.plainBody(), TQString::null); + CHECK(msg2.plainBody(), TQString()); msg2 = msg1; @@ -251,7 +251,7 @@ void KopeteMessage_Test::setup() void KopeteMessage_Test::testLinkParser() { - TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/link-parser-testcases"); + TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/link-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -259,10 +259,10 @@ void KopeteMessage_Test::testLinkParser() { TQString fileName = *it; TQString outputFileName = fileName; - outputFileName.replace("input","output"); + outputFileName.tqreplace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -283,12 +283,12 @@ void KopeteMessage_Test::testLinkParser() expectedFile.close(); // use a concrete url - inputData.replace( "$URL","http://www.kde.org" ); - expectedData.replace( "$URL","http://www.kde.org" ); + inputData.tqreplace( "$URL","http://www.kde.org" ); + expectedData.tqreplace( "$URL","http://www.kde.org" ); // set message format for parsing according to textcase filename convention Kopete::Message::MessageFormat format; - if ( fileName.section("-", 1, 1) == TQString::fromLatin1("plaintext") ) + if ( fileName.section("-", 1, 1) == TQString::tqfromLatin1("plaintext") ) format = Kopete::Message::PlainText; else format = Kopete::Message::RichText; @@ -298,11 +298,11 @@ void KopeteMessage_Test::testLinkParser() // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::fromLatin1(": ") + result; - expectedData = fileName + TQString::fromLatin1(": ") + expectedData; + result = fileName + TQString::tqfromLatin1(": ") + result; + expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) { //kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp index 51b8908a..ea298395 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp +++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp @@ -49,14 +49,14 @@ TQString retrieve( Password &pwd, const TQPixmap &image, const TQString &prompt TQTimer tmr; r.connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( timer() ) ); tmr.start( 1000 ); - qApp->exec(); + tqApp->exec(); return r.password; } void PasswordRetriever::gotPassword( const TQString &pass ) { password = pass; - qApp->quit(); + tqApp->quit(); } void PasswordRetriever::timer() @@ -101,7 +101,7 @@ int main( int argc, char *argv[] ) if ( newPwd.isEmpty() ) { _out << "Clearing password" << endl; - newPwd = TQString::null; + newPwd = TQString(); } else { diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.h b/kopete/libkopete/tests/kopetepasswordtest_program.h index 47c17172..776374c1 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.h +++ b/kopete/libkopete/tests/kopetepasswordtest_program.h @@ -3,9 +3,10 @@ #include <tqobject.h> -class PasswordRetriever : public QObject +class PasswordRetriever : public TQObject { Q_OBJECT + TQ_OBJECT public: TQString password; public slots: diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp index 76b8ae79..736bd2f8 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.cpp +++ b/kopete/libkopete/tests/kopetepropertiestest.cpp @@ -51,8 +51,8 @@ void KopetePropertiesTest::allTests() { PropertyHost myPropertyHost; CHECK( myPropertyHost.property(fooProperty).isNull(), true); - myPropertyHost.setProperty( fooProperty, TQString::fromLatin1("Foo!") ); - CHECK( myPropertyHost.property(fooProperty), TQString::fromLatin1("Foo!") ); + myPropertyHost.setProperty( fooProperty, TQString::tqfromLatin1("Foo!") ); + CHECK( myPropertyHost.property(fooProperty), TQString::tqfromLatin1("Foo!") ); } diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index cfc8b6e9..b6eaf635 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -38,8 +38,8 @@ void closeWallet() void delay() { - TQTimer::singleShot( 3000, qApp, TQT_SLOT( quit() ) ); - qApp->exec(); + TQTimer::singleShot( 3000, tqApp, TQT_SLOT( quit() ) ); + tqApp->exec(); } void openWalletAsync() @@ -76,9 +76,9 @@ int main( int argc, char *argv[] ) { TQString arg = args->arg( i ); _out << "Processing " << arg << endl; - if( arg == TQString::fromLatin1( "open" ) ) openWalletAsync(); - if( arg == TQString::fromLatin1( "close" ) ) closeWallet(); - if( arg == TQString::fromLatin1( "delay" ) ) delay(); + if( arg == TQString::tqfromLatin1( "open" ) ) openWalletAsync(); + if( arg == TQString::tqfromLatin1( "close" ) ) closeWallet(); + if( arg == TQString::tqfromLatin1( "delay" ) ) delay(); _out << "Done." << endl; } @@ -89,8 +89,8 @@ int main( int argc, char *argv[] ) timer.start( 1000 ); _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) ); - return qApp->exec(); + TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + return tqApp->exec(); } #include "kopetewallettest_program.moc" diff --git a/kopete/libkopete/tests/kopetewallettest_program.h b/kopete/libkopete/tests/kopetewallettest_program.h index b2e5d2fb..225fa6ad 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.h +++ b/kopete/libkopete/tests/kopetewallettest_program.h @@ -5,9 +5,10 @@ namespace KWallet { class Wallet; } -class WalletReciever : public QObject +class WalletReciever : public TQObject { Q_OBJECT + TQ_OBJECT public slots: void timer(); private slots: diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index 7d46fc34..35dde6b8 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -1,5 +1,5 @@ /* - Account mock object class + Account tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,9 +15,9 @@ ************************************************************************* */ -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" #include "kopetemetacontact.h" -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" namespace Kopete { @@ -26,7 +26,7 @@ namespace Test namespace Mock { -Account::Account(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) +Account::Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name) { } @@ -36,12 +36,12 @@ Account::~Account() } -bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) +bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) { return true; } -void Account::connect( const Kopete::OnlineStatus& initialStatus) +void Account::connect( const Kopete::OnlineStatus& initialtqStatus) { // do nothing } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index ac5a7253..93b1acdf 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -1,5 +1,5 @@ /* - Account mock object class + Account tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEACCOUNT_MOCK_H_ -#define _KOPETEACCOUNT_MOCK_H_ +#ifndef _KOPETEACCOUNT_TQMOCK_H_ +#define _KOPETEACCOUNT_TQMOCK_H_ #include "kopeteaccount.h" @@ -36,13 +36,13 @@ namespace Mock class Account : public Kopete::Account { public: - Account(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L); + Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); // pure virtual functions implementation - virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); - virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ); + virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ); + virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); virtual void disconnect(); - virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null ); + virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); }; } // end ns Kopete::Test::Mock diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp index ea90bee0..04f38727 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp @@ -1,5 +1,5 @@ /* - Contact mock object class + Contact tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,7 +15,7 @@ ************************************************************************* */ -#include "kopetecontact_mock.h" +#include "kopetecontact_tqmock.h" namespace Kopete { @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon) : Kopete::Contact( account, id, parent, icon) +Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon) : Kopete::Contact( account, id, tqparent, icon) { } diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h index faa78e3b..437887d9 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.h +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h @@ -1,5 +1,5 @@ /* - Contact mock object class + Contact tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETECONTACT_MOCK_H_ -#define _KOPETECONTACT_MOCK_H_ +#ifndef _KOPETECONTACT_TQMOCK_H_ +#define _KOPETECONTACT_TQMOCK_H_ #include "kopetecontact.h" @@ -35,7 +35,7 @@ namespace Mock class Contact : public Kopete::Contact { public: - Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon = TQString::null ); + Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon = TQString() ); ~Contact(); virtual Kopete::ChatSession* manager( CanCreateFlags canCreate = CannotCreate ); }; diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp index a3e543e3..66f325e3 100644 --- a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp @@ -1,5 +1,5 @@ /* - Message mock object class + Message tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,6 +15,6 @@ ************************************************************************* */ -#include "kopetemessage_mock.h" +#include "kopetemessage_tqmock.h" diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h index 13c92574..f8677ee6 100644 --- a/kopete/libkopete/tests/mock/kopetemessage_mock.h +++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h @@ -1,5 +1,5 @@ /* - Message mock object class + Message tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEMESSAGE_MOCK_H_ -#define _KOPETEMESSAGE_MOCK_H_ +#ifndef _KOPETEMESSAGE_TQMOCK_H_ +#define _KOPETEMESSAGE_TQMOCK_H_ #include "kopetemessage.h" diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp index 32f0fe1c..e9cc95a1 100644 --- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp @@ -15,6 +15,6 @@ ************************************************************************* */ -#include "kopetemetacontact_mock.h" +#include "kopetemetacontact_tqmock.h" diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h index f3311713..2fa6d8c6 100644 --- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h +++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEMETACONTACT_MOCK_H_ -#define _KOPETEMETACONTACT_MOCK_H_ +#ifndef _KOPETEMETACONTACT_TQMOCK_H_ +#define _KOPETEMETACONTACT_TQMOCK_H_ #include "kopetemetacontact.h" diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp index d9ae1d3a..03a65808 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp @@ -1,5 +1,5 @@ /* - Protocol mock object class + Protocol tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,7 +15,7 @@ ************************************************************************* */ -#include "kopeteprotocol_mock.h" +#include "kopeteprotocol_tqmock.h" namespace Kopete { @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) +Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name) { } @@ -34,16 +34,16 @@ Account* Protocol::createNewAccount( const TQString &accountId ) return 0L; } -AddContactPage* Protocol::createAddContactWidget( TQWidget *parent, Kopete::Account *account ) +AddContactPage* Protocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ) { return 0L; } -KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { return 0L; } -} // end ns mock +} // end ns tqmock } // end ns test } // end ns kopete diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h index d2502790..86b551d5 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h @@ -1,5 +1,5 @@ /* - Protocol mock object class + Protocol tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEPROTOCOL_MOCK_H_ -#define _KOPETEPROTOCOL_MOCK_H_ +#ifndef _KOPETEPROTOCOL_TQMOCK_H_ +#define _KOPETEPROTOCOL_TQMOCK_H_ #include "kopeteprotocol.h" @@ -37,11 +37,11 @@ namespace Mock class Protocol : public Kopete::Protocol { public: - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( KInstance *instance, TQObject *tqparent, const char *name ); // pure virtual functions implemented virtual Account *createNewAccount( const TQString &accountId ); - virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); }; } // end ns Kopete::Test::Mock diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index 345e9ab4..e1f31900 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 *parent, Kopete::Account *acc) - : KListViewItem(parent) + AccountListViewItem(TQListView *tqparent, Kopete::Account *acc) + : KListViewItem(tqparent) { if (acc==0) return; @@ -62,8 +62,8 @@ class AccountSelectorPrivate }; -AccountSelector::AccountSelector(TQWidget *parent, const char *name) - : TQWidget(parent, name) +AccountSelector::AccountSelector(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << "for no special protocol" << endl; d = new AccountSelectorPrivate; @@ -72,8 +72,8 @@ AccountSelector::AccountSelector(TQWidget *parent, const char *name) } -AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *parent, - const char *name) : TQWidget(parent, name) +AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent, + const char *name) : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << " for protocol " << proto->pluginId() << endl; d = new AccountSelectorPrivate; @@ -95,7 +95,7 @@ void AccountSelector::initUI() (new TQVBoxLayout(this))->setAutoAdd(true); d->lv = new KListView(this); d->lv->setFullWidth(true); - d->lv->addColumn(TQString::fromLatin1("")); + d->lv->addColumn(TQString::tqfromLatin1("")); d->lv->header()->hide(); if(d->proto != 0) diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h index c812453d..bdb4c888 100644 --- a/kopete/libkopete/ui/accountselector.h +++ b/kopete/libkopete/ui/accountselector.h @@ -28,27 +28,28 @@ class TQListViewItem; * \brief widget to select an account, based on KListView * @author Stefan Gehn <metz AT gehn.net> */ -class KOPETE_EXPORT AccountSelector : public QWidget +class KOPETE_EXPORT AccountSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. */ - AccountSelector(TQWidget *parent=0, const char *name=0); + AccountSelector(TQWidget *tqparent=0, const char *name=0); /** * Constructor for a list of accounts for one protocol only * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. @p proto defines the protocol whose accounts are * shown in the list */ - AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0); + AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent=0, const char *name=0); /** * Destructor. diff --git a/kopete/libkopete/ui/addcontactpage.cpp b/kopete/libkopete/ui/addcontactpage.cpp index 846815f2..4916b955 100644 --- a/kopete/libkopete/ui/addcontactpage.cpp +++ b/kopete/libkopete/ui/addcontactpage.cpp @@ -17,7 +17,7 @@ #include "addcontactpage.h" -AddContactPage::AddContactPage(TQWidget *parent, const char *name ) : TQWidget(parent,name) +AddContactPage::AddContactPage(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { } diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h index d72e2fd1..f215f3b0 100644 --- a/kopete/libkopete/ui/addcontactpage.h +++ b/kopete/libkopete/ui/addcontactpage.h @@ -29,12 +29,13 @@ * (in the case of jabber, i need to translate the legacy id to a JID) * this could also be usefull in the case of MLSN to check if no error (and also jabber) */ -class KOPETE_EXPORT AddContactPage : public QWidget +class KOPETE_EXPORT AddContactPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddContactPage(TQWidget *parent=0, const char *name=0); + AddContactPage(TQWidget *tqparent=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 0d544d27..e34518b7 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -38,9 +38,9 @@ namespace Kopete { namespace UI { -AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) +AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 ) { - btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) ); + btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) ); connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) ); } @@ -66,7 +66,7 @@ void AddressBookLinkWidget::slotClearAddressee() edtAddressee->clear(); btnClear->setEnabled( false ); KABC::Addressee mrEmpty; - mSelectedUid = TQString::null; + mSelectedUid = TQString(); emit addresseeChanged( mrEmpty ); } @@ -74,11 +74,11 @@ void AddressBookLinkWidget::slotSelectAddressee() { TQString message; if ( mMetaContact ) - message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() ); + message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() ); else message = i18n("Choose the corresponding entry in the address book" ); - Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString::null ), this ); + Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString() ), this ); int result = dialog.exec(); KABC::Addressee addr; @@ -88,7 +88,7 @@ void AddressBookLinkWidget::slotSelectAddressee() edtAddressee->setText( addr.realName() ); btnClear->setEnabled( !addr.isEmpty() ); - mSelectedUid = ( addr.isEmpty() ? TQString::null : addr.uid() ); + mSelectedUid = ( addr.isEmpty() ? TQString() : addr.uid() ); emit addresseeChanged( addr ); } } diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h index fa44d530..31d90a8c 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.h +++ b/kopete/libkopete/ui/addressbooklinkwidget.h @@ -43,8 +43,9 @@ namespace UI { class AddressBookLinkWidget : public AddressBookLinkWidgetBase { Q_OBJECT + TQ_OBJECT public: - AddressBookLinkWidget( TQWidget * parent, const char * name ); + AddressBookLinkWidget( TQWidget * tqparent, const char * name ); ~AddressBookLinkWidget() {} /** * Set the currently selected addressee diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 4656459c..652e292a 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddressBookLinkWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressBookLinkWidgetBase</cstring> </property> @@ -19,9 +19,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ <string>Clear</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSelectAddressee</cstring> </property> @@ -70,7 +70,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp index 44f42e2a..5133b4ee 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 *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true ) +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 ) { 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 *parent) +KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent) { - AddressBookSelectorDialog dialog(title, message, preSelectUid, parent); + AddressBookSelectorDialog dialog(title, message, preSelectUid, tqparent); int result = dialog.exec(); KABC::Addressee adr; diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h index 470f3407..db676a3c 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.h +++ b/kopete/libkopete/ui/addressbookselectordialog.h @@ -47,11 +47,12 @@ class AddressBookSelectorWidget; class KOPETE_EXPORT AddressBookSelectorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * The constructor of an empty AddressBookSelectorWidget */ - AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent=0L, const char *name=0L, bool modal = false ); + AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog */ @@ -71,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 *parent = 0L ); + static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent = 0L ); protected slots: virtual void accept(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index 4b106315..d67c3671 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -54,8 +54,8 @@ namespace Kopete namespace UI { -AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const char *name ) - : AddressBookSelectorWidget_Base( parent, name ) +AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *tqparent, const char *name ) + : AddressBookSelectorWidget_Base( tqparent, name ) { m_addressBook = Kopete::KABCPersistence::self()->addressBook(); @@ -74,7 +74,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch //We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks - addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email")); + addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email")); kListViewSearchLine->setListView(addresseeListView); slotLoadAddressees(); @@ -144,7 +144,7 @@ void AddressBookSelectorWidget::setLabelMessage( const TQString &msg ) void AddressBookSelectorWidget::slotAddAddresseeClicked() { // Pop up add addressee dialog - TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString::null, 0, this ); + TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString(), 0, this ); if ( !addresseeName.isEmpty() ) { @@ -154,7 +154,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() Kopete::KABCPersistence::self()->writeAddressBook( 0 ); slotLoadAddressees(); // select the addressee we just added - TQListViewItem * added = addresseeListView->findItem( addresseeName, 1 ); + TQListViewItem * added = addresseeListView->tqfindItem( addresseeName, 1 ); kListViewSearchLine->clear(); kListViewSearchLine->updateSearch(); addresseeListView->setSelected( added, true ); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h index 3b26cece..028e6d6c 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.h +++ b/kopete/libkopete/ui/addressbookselectorwidget.h @@ -48,8 +48,9 @@ namespace UI class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget_Base { Q_OBJECT + TQ_OBJECT public: - AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + AddressBookSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~AddressBookSelectorWidget(); KABC::Addressee addressee(); /** diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index d5e2e6f2..f67300df 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddressBookSelectorWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressBookSelectorWidget_Base</cstring> </property> @@ -40,14 +40,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>405</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>addAddresseeButton</cstring> </property> @@ -126,15 +126,15 @@ <string>Select the contact you want to communicate with via Instant Messaging</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblSearch</cstring> </property> @@ -165,8 +165,8 @@ <includes> <include location="global" impldecl="in declaration">klistviewsearchline.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>klistview.h</includehint> diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp index 9fa9f023..382693ea 100644 --- a/kopete/libkopete/ui/addresseeitem.cpp +++ b/kopete/libkopete/ui/addresseeitem.cpp @@ -27,8 +27,8 @@ #include "addresseeitem.h" -AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : - KListViewItem( parent ), +AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) : + KListViewItem( tqparent ), mAddressee( addressee ) { //We can't save showphoto because we don't have a d pointer @@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const { if (column == Email) { TQString value = text(Email); - TQRegExp emailRe(TQString::fromLatin1("<\\S*>")); + TQRegExp emailRe(TQString::tqfromLatin1("<\\S*>")); int match = emailRe.search(value); if (match > -1) value = value.mid(match + 1, emailRe.matchedLength() - 2); diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h index 36d1d284..695ea6c2 100644 --- a/kopete/libkopete/ui/addresseeitem.h +++ b/kopete/libkopete/ui/addresseeitem.h @@ -46,10 +46,10 @@ class AddresseeItem : public KListViewItem /** Constructor. - @param parent The parent listview. + @param tqparent The tqparent listview. @param addressee The associated addressee. */ - AddresseeItem( TQListView *parent, const KABC::Addressee &addressee ); + AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee ); /** Returns the addressee. diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 9084bd39..e5fd81b4 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -71,9 +71,9 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->account=account; d->contactId=contactId; d->widget->m_label->setText(i18n("<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added you to his/her contactlist. (Account %3)</qt>") - .arg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":") + KURL::encode_string( account->accountId() ) , - contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >") , + contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >") , account->accountLabel() ) ); if( hide & InfoButton) d->widget->m_infoButton->hide() ; @@ -100,7 +100,7 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->widget->m_groupList->insertItem(groupname); } } - d->widget->m_groupList->setCurrentText(TQString::null); //default to top-level + d->widget->m_groupList->setCurrentText(TQString()); //default to top-level connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const KABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const KABC::Addressee& ) ) ); connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) ); diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h index be5349a4..e4fe5a61 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.h +++ b/kopete/libkopete/ui/contactaddednotifydialog.h @@ -43,7 +43,7 @@ namespace UI { * @code Kopete::UI::ContactAddedNotifyDialog *dialog = - new ContactAddedNotifyDialog(contactId, TQString::null,account); + new ContactAddedNotifyDialog(contactId, TQString(),account); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogApplied())); TQObject::connect(dialog,TQT_SIGNAL(infoClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogInfo())); dialog->show(); @@ -70,6 +70,7 @@ namespace UI { class KOPETE_EXPORT ContactAddedNotifyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * All widget in the dialog that may be hidden. @@ -90,10 +91,10 @@ 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 bitmask of HideWidget used to hide some widget. By default, everything is shown. + * @param hide a bittqmask of HideWidget used to hide some widget. By default, everything is shown. * */ - ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString::null, + ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString(), Kopete::Account *account=0L, uint hide=0x00); /** @@ -152,7 +153,7 @@ signals: * signal to a slot which show a dialog with more info about the * contact. * - * hint: you can use sender() as parent of the new dialog + * hint: you can use sender() as tqparent 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/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 47d3f070..6517c1e0 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ContactAddedNotifyWidget</class> <author>Olivier Goffart</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -17,20 +17,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_label</cstring> </property> <property name="text"> <string>The contact XXX added you in his contactlist</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>20</height> @@ -63,7 +63,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_authorizeCb</cstring> </property> @@ -74,7 +74,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_addCb</cstring> </property> @@ -85,7 +85,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_contactInfoBox</cstring> </property> @@ -96,15 +96,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -133,15 +133,15 @@ Leave it empty if you want to see the contact nickname as display name.</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -173,7 +173,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -181,9 +181,9 @@ Leave it empty if you want to see the contact nickname as display name.</string> <string>Addressbook link:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -199,7 +199,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -225,7 +225,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <header>addressbooklinkwidget.h</header> </customwidget> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index 3d697b0f..412ea20e 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>FileConfirmBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileConfirmBase</cstring> </property> @@ -25,18 +25,18 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>A user is trying to send you a file. The file will only be downloaded if you accept this dialog. If you do not wish to receive it, please click 'Refuse'. This file will never be executed by Kopete at any point during or after the transfer.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -44,7 +44,7 @@ <string>From:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -65,7 +65,7 @@ <string>&Browse...</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel11</cstring> </property> @@ -73,7 +73,7 @@ <string>Size:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -81,7 +81,7 @@ <string>Description:</string> </property> </widget> - <widget class="QTextEdit" row="3" column="1" rowspan="2" colspan="2"> + <widget class="TQTextEdit" row="3" column="1" rowspan="2" colspan="2"> <property name="name"> <cstring>m_description</cstring> </property> @@ -99,14 +99,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel13</cstring> </property> @@ -140,7 +140,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 7c441d0f..14a6b4e6 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=(parent, 0, name) +ConstructorArgs=(tqparent, 0, name) Group=Input (Kopete) [Kopete::UI::AddressBookLinkWidget] ToolTip=Address Book Link Widget (Kopete) WhatsThis=KABC::Addressee display/selector IncludeFile=addressbooklinkwidget.h -ConstructorArgs=(parent, name) +ConstructorArgs=(tqparent, name) Group=Input (Kopete) diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 783fe4da..26eb3590 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KopeteAwayDialog_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopeteAwayDialog_Base</cstring> </property> @@ -19,14 +19,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>Please specify an away message, or choose a predefined one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index cc6754d2..c3938aff 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 *parent ) -: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(), - parent, contact->contactId().latin1() ) + const char *slot, KAction *tqparent ) +: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(), + tqparent, contact->contactId().latin1() ) { m_contact = contact; diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h index ba170ebb..73c39bb7 100644 --- a/kopete/libkopete/ui/kopetecontactaction.h +++ b/kopete/libkopete/ui/kopetecontactaction.h @@ -32,12 +32,13 @@ class Contact; class KOPETE_EXPORT KopeteContactAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create a new KopeteContactAction */ - KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent ); + KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* tqparent ); ~KopeteContactAction(); Kopete::Contact * contact() const; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fffeec66..bf456663 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 *parent, const char *name ) -: KDialogBase( parent, name, false, i18n( "A User Would Like to Send You a File" ), +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" ), KDialogBase::User1 | KDialogBase::User2, KDialogBase::User1, true, i18n( "&Refuse" ), i18n( "&Accept" ) ), m_info( info ) { @@ -40,15 +40,15 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_emited=false; m_view=new FileConfirmBase(this, "FileConfirmView"); - m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + - info.contact()->contactId() + TQString::fromLatin1( "> " ) ); + m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) + + info.contact()->contactId() + TQString::tqfromLatin1( "> " ) ); m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); KGlobal::config()->setGroup("File Transfer"); const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); - m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); + m_view->m_saveto->setText(defaultPath + TQString::tqfromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog() void KopeteFileConfirmDialog::slotBrowsePressed() { - TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); + TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); if ( !saveFileName.isNull()) { m_view->m_saveto->setText(saveFileName); @@ -83,7 +83,7 @@ void KopeteFileConfirmDialog::slotUser2() if(TQFile(m_view->m_saveto->text()).exists()) { - int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").arg(m_view->m_saveto->text()) , + int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").tqarg(m_view->m_saveto->text()) , i18n("Overwrite File") , KStdGuiItem::save()); if(ret==KMessageBox::Cancel) return; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h index ac5d19a4..0292f4d7 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.h +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h @@ -31,9 +31,10 @@ class FileConfirmBase; class KopeteFileConfirmDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString::null, TQWidget *parent=0, const char* name=0); + KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *tqparent=0, const char* name=0); ~KopeteFileConfirmDialog(); private: diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 9630592c..eb755f29 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -41,13 +41,13 @@ namespace ListView { /* Custom TQToolTip for the list view. The decision whether or not to show tooltips is taken in - maybeTip(). See also the TQListView sources from Qt itself. + maybeTip(). See also the TQListView sources from TQt itself. Delegates to the list view items. */ -class ToolTip : public QToolTip +class ToolTip : public TQToolTip { public: - ToolTip( TQWidget *parent, ListView *lv ); + ToolTip( TQWidget *tqparent, ListView *lv ); virtual ~ToolTip(); void maybeTip( const TQPoint &pos ); @@ -56,8 +56,8 @@ private: ListView *m_listView; }; -ToolTip::ToolTip( TQWidget *parent, ListView *lv ) - : TQToolTip( parent ) +ToolTip::ToolTip( TQWidget *tqparent, ListView *lv ) + : TQToolTip( tqparent ) { m_listView = lv; } @@ -68,19 +68,19 @@ ToolTip::~ToolTip() void ToolTip::maybeTip( const TQPoint &pos ) { - if( !parentWidget() || !m_listView ) + if( !tqparentWidget() || !m_listView ) return; if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) ) { - TQRect itemRect = m_listView->itemRect( item ); + TQRect tqitemRect = m_listView->tqitemRect( item ); uint leftMargin = m_listView->treeStepSize() * ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + m_listView->itemMargin(); - uint xAdjust = itemRect.left() + leftMargin; - uint yAdjust = itemRect.top(); + uint xAdjust = tqitemRect.left() + leftMargin; + uint yAdjust = tqitemRect.top(); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); std::pair<TQString,TQRect> toolTip = item->toolTip( relativePos ); @@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos ) return; toolTip.second.moveBy( xAdjust, yAdjust ); -// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: " +// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: " // << toolTip.second << ", tooltip: " << toolTip.first << endl; tip( toolTip.second, toolTip.first ); } @@ -102,8 +102,8 @@ struct ListView::Private Private() {} }; -ListView::ListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), d( new Private ) +ListView::ListView( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), d( new Private ) { connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); @@ -120,9 +120,9 @@ ListView::ListView( TQWidget *parent, const char *name ) clearWFlags( WStaticContents ); setWFlags( WNoAutoErase ); - // clear the appropriate flags from the viewport - qt docs say we have to mask + // clear the appropriate flags from the viewport - qt docs say we have to tqmask // 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. + // that doesn't do the job. tqmasking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents ); // static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase ); @@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree ) setRootIsDecorated( false ); setTreeStepSize( 0 ); } - // TODO: relayout all items. their width may have changed, but they won't know about it. + // TODO: retqlayout all items. their width may have changed, but they won't know about it. } /* This is a small hack ensuring that only F2 triggers inline @@ -188,12 +188,12 @@ void ListView::setShowTreeLines( bool bShowAsTree ) void ListView::keyPressEvent( TQKeyEvent *e ) { TQListViewItem *item = currentItem(); - if ( (e->key() == Qt::Key_F2) && item && item->isVisible() ) + if ( (e->key() == TQt::Key_F2) && item && item->isVisible() ) rename( item, 0 ); - else if ( (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && item && item->isVisible() ) + else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() ) { // must provide a point within the item; emitExecute checks for this - TQPoint p = viewport()->mapToGlobal(itemRect(item).center()); + TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center()); emitExecute( currentItem(), p, 0 ); } else diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h index 2e065212..05102e53 100644 --- a/kopete/libkopete/ui/kopetelistview.h +++ b/kopete/libkopete/ui/kopetelistview.h @@ -32,9 +32,10 @@ namespace ListView { class ListView : public KListView { Q_OBJECT + TQ_OBJECT public: - ListView( TQWidget *parent = 0, const char *name = 0 ); + ListView( TQWidget *tqparent = 0, const char *name = 0 ); ~ListView(); /** diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index e02b14b3..1b1f7b6c 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1,5 +1,5 @@ /* - kopetelistviewitem.cpp - Kopete's modular QListViewItems + kopetelistviewitem.cpp - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN <engin@bzzzt.biz> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> @@ -76,7 +76,7 @@ Component *ComponentBase::componentAt( const TQPoint &pt ) { for ( uint n = 0; n < components(); ++n ) { - if ( component( n )->rect().contains( pt ) ) + if ( component( n )->rect().tqcontains( pt ) ) { if ( Component *comp = component( n )->componentAt( pt ) ) return comp; @@ -117,10 +117,10 @@ void ComponentBase::componentResized( Component * ) std::pair<TQString,TQRect> ComponentBase::toolTip( const TQPoint &relativePos ) { for ( uint n = 0; n < components(); ++n ) - if ( component( n )->rect().contains( relativePos ) ) + if ( component( n )->rect().tqcontains( relativePos ) ) return component( n )->toolTip( relativePos ); - return std::make_pair( TQString::null, TQRect() ); + return std::make_pair( TQString(), TQRect() ); } void ComponentBase::updateAnimationPosition( int p, int s ) @@ -144,13 +144,13 @@ void ComponentBase::updateAnimationPosition( int p, int s ) class Component::Private { public: - Private( ComponentBase *parent ) - : parent( parent ), minWidth( 0 ), minHeight( 0 ) + Private( ComponentBase *tqparent ) + : tqparent( tqparent ), minWidth( 0 ), minHeight( 0 ) , growHoriz( false ), growVert( false ) , tipSource( 0 ) { } - ComponentBase *parent; + ComponentBase *tqparent; TQRect rect; TQRect startRect, targetRect; int minWidth, minHeight; @@ -159,10 +159,10 @@ public: ToolTipSource *tipSource; }; -Component::Component( ComponentBase *parent ) - : d( new Private( parent ) ) +Component::Component( ComponentBase *tqparent ) + : d( new Private( tqparent ) ) { - d->parent->componentAdded( this ); + d->tqparent->componentAdded( this ); d->show = true; } @@ -170,7 +170,7 @@ int Component::RTTI = Rtti_Component; Component::~Component() { - d->parent->componentRemoved( this ); + d->tqparent->componentRemoved( this ); delete d; } @@ -224,7 +224,7 @@ bool Component::setMinWidth( int width ) if ( d->minWidth == width ) return false; d->minWidth = width; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } bool Component::setMinHeight( int height ) @@ -232,11 +232,11 @@ bool Component::setMinHeight( int height ) if ( d->minHeight == height ) return false; d->minHeight = height; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } -void Component::layout( const TQRect &newRect ) +void Component::tqlayout( const TQRect &newRect ) { if ( rect().isNull() ) d->startRect = TQRect( newRect.topLeft(), newRect.topLeft() ); @@ -253,7 +253,7 @@ void Component::setRect( const TQRect &rect ) void Component::paint( TQPainter *painter, const TQColorGroup &cg ) { - /*painter->setPen( Qt::red ); + /*painter->setPen( TQt::red ); painter->drawRect( rect() );*/ for ( uint n = 0; n < components(); ++n ) { @@ -262,26 +262,26 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg ) } } -void Component::repaint() +void Component::tqrepaint() { - d->parent->repaint(); + d->tqparent->tqrepaint(); } -void Component::relayout() +void Component::retqlayout() { - d->parent->relayout(); + d->tqparent->retqlayout(); } void Component::componentAdded( Component *component ) { ComponentBase::componentAdded( component ); - //update( Relayout ); + //update( Retqlayout ); } void Component::componentRemoved( Component *component ) { ComponentBase::componentRemoved( component ); - //update( Relayout ); + //update( Retqlayout ); } // BoxComponent -------- @@ -295,8 +295,8 @@ public: static const int padding = 0; }; -BoxComponent::BoxComponent( ComponentBase *parent, Direction dir ) - : Component( parent ), d( new Private( dir ) ) +BoxComponent::BoxComponent( ComponentBase *tqparent, Direction dir ) + : Component( tqparent ), d( new Private( dir ) ) { } @@ -309,11 +309,11 @@ BoxComponent::~BoxComponent() int BoxComponent::widthForHeight( int height ) { - if ( d->direction != Horizontal ) + if ( d->direction !=Qt::Horizontal ) { int width = 0; for ( uint n = 0; n < components(); ++n ) - width = QMAX( width, component( n )->widthForHeight( height ) ); + width = TQMAX( width, component( n )->widthForHeight( height ) ); return width; } else @@ -327,11 +327,11 @@ int BoxComponent::widthForHeight( int height ) int BoxComponent::heightForWidth( int width ) { - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { int height = 0; for ( uint n = 0; n < components(); ++n ) - height = QMAX( height, component( n )->heightForWidth( width ) ); + height = TQMAX( height, component( n )->heightForWidth( width ) ); return height; } else @@ -349,20 +349,20 @@ void BoxComponent::calcMinSize() for ( uint n = 0; n < components(); ++n ) { Component *comp = component( n ); - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { - max = QMAX( max, comp->minHeight() ); + max = TQMAX( max, comp->minHeight() ); sum += comp->minWidth(); } else { - max = QMAX( max, comp->minWidth() ); + max = TQMAX( max, comp->minWidth() ); sum += comp->minHeight(); } } bool sizeChanged = false; - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { if ( setMinWidth( sum ) ) sizeChanged = true; if ( setMinHeight( max ) ) sizeChanged = true; @@ -374,16 +374,16 @@ void BoxComponent::calcMinSize() } if ( sizeChanged ) - repaint(); + tqrepaint(); else - relayout(); + retqlayout(); } -void BoxComponent::layout( const TQRect &rect ) +void BoxComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); - bool horiz = (d->direction == Horizontal); + bool horiz = (d->direction ==Qt::Horizontal); int fixedSize = 0; for ( uint n = 0; n < components(); ++n ) { @@ -402,9 +402,9 @@ void BoxComponent::layout( const TQRect &rect ) // that cases we should pretend that we're wide/high enough. int total; if ( horiz ) - total = QMAX( rect.width(), minWidth() ); + total = TQMAX( rect.width(), minWidth() ); else - total = QMAX( rect.height(), minHeight() ); + total = TQMAX( rect.height(), minHeight() ); int remaining = total - fixedSize - padding * (components() - 1); @@ -422,7 +422,7 @@ void BoxComponent::layout( const TQRect &rect ) rc.setHeight( rect.height() ); int minWidth = comp->minWidth(); int desiredWidth = comp->widthForHeight( rect.height() ); - rc.setWidth( QMIN( remaining + minWidth, desiredWidth ) ); + rc.setWidth( TQMIN( remaining + minWidth, desiredWidth ) ); pos += rc.width(); remaining -= rc.width() - minWidth; } @@ -433,11 +433,11 @@ void BoxComponent::layout( const TQRect &rect ) rc.setWidth( rect.width() ); int minHeight = comp->minHeight(); int desiredHeight = comp->heightForWidth( rect.width() ); - rc.setHeight( QMIN( remaining + minHeight, desiredHeight ) ); + rc.setHeight( TQMIN( remaining + minHeight, desiredHeight ) ); pos += rc.height(); remaining -= rc.height() - minHeight; } - comp->layout( rc & rect ); + comp->tqlayout( rc & rect ); pos += padding; } } @@ -482,8 +482,8 @@ public: TQPixmap bottom_pixmap; }; -ContactBoxComponent::ContactBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +ContactBoxComponent::ContactBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} ContactBoxComponent::~ContactBoxComponent() @@ -518,7 +518,7 @@ void ContactBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void ContactBoxComponent::layout(const TQRect &rect) +void ContactBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -529,8 +529,8 @@ void ContactBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int ContactBoxComponent::widthForHeight(int height) @@ -620,8 +620,8 @@ public: TQPixmap bottom_pixmap; }; -GroupBoxComponent::GroupBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +GroupBoxComponent::GroupBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} GroupBoxComponent::~GroupBoxComponent() @@ -661,7 +661,7 @@ void GroupBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void GroupBoxComponent::layout(const TQRect &rect) +void GroupBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -672,8 +672,8 @@ void GroupBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int GroupBoxComponent::widthForHeight(int height) @@ -746,19 +746,19 @@ public: TQPixmap image; }; -ImageComponent::ImageComponent( ComponentBase *parent ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent ) + : Component( tqparent ), d( new Private ) { } int ImageComponent::RTTI = Rtti_ImageComponent; -ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent, int minW, int minH ) + : Component( tqparent ), d( new Private ) { setMinWidth( minW ); setMinHeight( minH ); - repaint(); + tqrepaint(); } ImageComponent::~ImageComponent() @@ -777,7 +777,7 @@ void ImageComponent::setPixmap( const TQPixmap &img, bool) setMinWidth(d->image.width()); setMinHeight(d->image.height()); - repaint(); + tqrepaint(); } void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) @@ -790,7 +790,7 @@ void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) painter->drawPixmap( rc & ourRc, d->image ); } -void ImageComponent::scale( int w, int h, TQImage::ScaleMode mode ) +void ImageComponent::scale( int w, int h, TQ_ScaleMode mode ) { TQImage im = d->image.convertToImage(); setPixmap( TQPixmap( im.smoothScale( w, h, mode ) ) ); @@ -814,7 +814,7 @@ void FaceComponent::setPixmap(const TQPixmap &img, bool) setMinHeight(d->image.height() + 4); } - repaint(); + tqrepaint(); } static TQPoint operator+(const TQPoint &pt, const TQSize &sz) @@ -858,8 +858,8 @@ public: TQFont font; }; -TextComponent::TextComponent( ComponentBase *parent, const TQFont &font, const TQString &text ) - : Component( parent ), d( new Private ) +TextComponent::TextComponent( ComponentBase *tqparent, const TQFont &font, const TQString &text ) + : Component( tqparent ), d( new Private ) { setFont( font ); setText( text ); @@ -881,7 +881,7 @@ void TextComponent::setText( const TQString &text ) { if ( text == d->text ) return; d->text = text; - relayout(); + retqlayout(); calcMinSize(); } @@ -906,7 +906,7 @@ void TextComponent::calcMinSize() else setMinHeight( 0 ); - repaint(); + tqrepaint(); } int TextComponent::widthForHeight( int ) @@ -927,13 +927,13 @@ void TextComponent::setColor( const TQColor &color ) { d->color = color; d->customColor = true; - repaint(); + tqrepaint(); } void TextComponent::setDefaultColor() { d->customColor = false; - repaint(); + tqrepaint(); } void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) @@ -944,7 +944,7 @@ void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) painter->setPen( cg.text() ); TQString dispStr = KStringHandler::rPixelSqueeze( d->text, TQFontMetrics( font() ), rect().width() ); painter->setFont( font() ); - painter->drawText( rect(), Qt::SingleLine, dispStr ); + painter->drawText( rect(), TQt::SingleLine, dispStr ); } // DisplayNameComponent @@ -956,8 +956,8 @@ public: TQFont font; }; -DisplayNameComponent::DisplayNameComponent( ComponentBase *parent ) - : BoxComponent( parent ), d( new Private ) +DisplayNameComponent::DisplayNameComponent( ComponentBase *tqparent ) + : BoxComponent( tqparent ), d( new Private ) { } @@ -968,9 +968,9 @@ DisplayNameComponent::~DisplayNameComponent() delete d; } -void DisplayNameComponent::layout( const TQRect &rect ) +void DisplayNameComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); // finally, lay everything out TQRect rc; @@ -989,7 +989,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) if ( comp->rtti() == Rtti_TextComponent ) { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), totalWidth - usedWidth, comp->heightForWidth( totalWidth - usedWidth ) ) ); } else { @@ -999,7 +999,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) else { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), comp->widthForHeight( rect.height() ), comp->heightForWidth( rect.width() ) ) ); } @@ -1052,7 +1052,7 @@ void DisplayNameComponent::redraw() case Kopete::Emoticons::Image: ic = new ImageComponent( this ); ic->setPixmap( TQPixmap( (*token).picPath ) ); - ic->scale( INT_MAX, fontHeight, TQImage::ScaleMin ); + ic->scale( INT_MAX, fontHeight, TQ_ScaleMin ); break; default: kdDebug( 14010 ) << k_funcinfo << "This should have not happened!" << endl; @@ -1092,8 +1092,8 @@ TQString DisplayNameComponent::text() // HSpacerComponent -------- -HSpacerComponent::HSpacerComponent( ComponentBase *parent ) - : Component( parent ) +HSpacerComponent::HSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1108,8 +1108,8 @@ int HSpacerComponent::widthForHeight( int ) // VSpacerComponent -------- -VSpacerComponent::VSpacerComponent( ComponentBase *parent ) - : Component( parent ) +VSpacerComponent::VSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1131,7 +1131,7 @@ public: int iconSize; }; -ContactComponent::ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int) : ImageComponent( parent ) , d( new Private ) +ContactComponent::ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int) : ImageComponent( tqparent ) , d( new Private ) { d->contact = contact; d->iconSize = 12; // size of the image is fixed to 12 pixels @@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent() void ContactComponent::updatePixmap() { - setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) ); + setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) ); } Kopete::Contact *ContactComponent::contact() { @@ -1160,7 +1160,7 @@ std::pair<TQString,TQRect> ContactComponent::toolTip( const TQPoint &/*relativeP ////////////////// SpacerComponent ///////////////////////// -SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Component( parent ) +SpacerComponent::SpacerComponent( ComponentBase *tqparent, int w, int h ) : Component( tqparent ) { setMinWidth(w); setMinHeight(h); @@ -1172,7 +1172,7 @@ SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Compon * A periodic timer intended to be shared amongst multiple objects. Will run only * if an object is attached to it. */ -class SharedTimer : private QTimer +class SharedTimer : private TQTimer { int period; int users; @@ -1227,17 +1227,17 @@ class Item::Private { public: Private( Item *item ) - : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } - TQTimer layoutTimer; + TQTimer tqlayoutTimer; - //TQTimer layoutAnimateTimer; - SharedTimerRef layoutAnimateTimer; + //TQTimer tqlayoutAnimateTimer; + SharedTimerRef tqlayoutAnimateTimer; SharedTimer &theLayoutAnimateTimer() { static SharedTimer timer( 10 ); @@ -1245,8 +1245,8 @@ public: } bool animateLayout; - int layoutAnimateSteps; - static const int layoutAnimateStepsTotal = 10; + int tqlayoutAnimateSteps; + static const int tqlayoutAnimateStepsTotal = 10; float opacity; @@ -1279,14 +1279,14 @@ bool Item::Private::animateChanges = true; bool Item::Private::fadeVisibility = true; bool Item::Private::foldVisibility = true; -Item::Item( TQListViewItem *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListViewItem *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } -Item::Item( TQListView *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListView *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } @@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding ) void Item::initLVI() { connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); - connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); + connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); + //connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); @@ -1316,20 +1316,20 @@ void Item::initLVI() void Item::slotColumnResized() { scheduleLayout(); - // if we've been resized, don't animate the layout + // if we've been resized, don't animate the tqlayout d->animateLayout = false; } void Item::scheduleLayout() { - // perform a delayed layout in order to speed it all up - if ( ! d->layoutTimer.isActive() ) - d->layoutTimer.start( 30, true ); + // perform a delayed tqlayout in order to speed it all up + if ( ! d->tqlayoutTimer.isActive() ) + d->tqlayoutTimer.start( 30, true ); } void Item::slotLayoutItems() { - d->layoutTimer.stop(); + d->tqlayoutTimer.stop(); for ( uint n = 0; n < components(); ++n ) { @@ -1341,20 +1341,20 @@ void Item::slotLayoutItems() } int height = component( n )->heightForWidth( width ); - component( n )->layout( TQRect( 0, 0, width, height ) ); + component( n )->tqlayout( TQRect( 0, 0, width, height ) ); //kdDebug(14000) << k_funcinfo << "Component " << n << " is " << width << " x " << height << endl; } if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) { - d->layoutAnimateTimer.start(); - //if ( !d->layoutAnimateTimer.isActive() ) - // d->layoutAnimateTimer.start( 10 ); - d->layoutAnimateSteps = 0; + d->tqlayoutAnimateTimer.start(); + //if ( !d->tqlayoutAnimateTimer.isActive() ) + // d->tqlayoutAnimateTimer.start( 10 ); + d->tqlayoutAnimateSteps = 0; } else { - d->layoutAnimateSteps = Private::layoutAnimateStepsTotal; + d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; d->animateLayout = true; } slotLayoutAnimateItems(); @@ -1362,15 +1362,15 @@ void Item::slotLayoutItems() void Item::slotLayoutAnimateItems() { - if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal ) - d->layoutAnimateTimer.stop(); + if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) + d->tqlayoutAnimateTimer.stop(); - const int s = Private::layoutAnimateStepsTotal; - const int p = QMIN( d->layoutAnimateSteps, s ); + const int s = Private::tqlayoutAnimateStepsTotal; + const int p = TQMIN( d->tqlayoutAnimateSteps, s ); updateAnimationPosition( p, s ); setHeight(0); - repaint(); + tqrepaint(); } float Item::opacity() @@ -1382,7 +1382,7 @@ void Item::setOpacity( float opacity ) { if ( d->opacity == opacity ) return; d->opacity = opacity; - repaint(); + tqrepaint(); } void Item::setSearchMatch( bool match ) @@ -1411,7 +1411,7 @@ void Item::setTargetVisibility( bool vis ) { if ( d->visibilityTarget == vis ) { - // in case we're getting called because our parent was shown and + // in case we're getting called because our tqparent was shown and // we need to be rehidden if ( !d->visibilityTimer.isActive() ) setVisible( vis && d->searchMatch ); @@ -1451,18 +1451,18 @@ void Item::slotUpdateVisibility() setVisible( false ); } setHeight( 0 ); - repaint(); + tqrepaint(); } -void Item::repaint() +void Item::tqrepaint() { - // if we're about to relayout, don't bother painting yet. - if ( d->layoutTimer.isActive() ) + // if we're about to retqlayout, don't bother painting yet. + if ( d->tqlayoutTimer.isActive() ) return; - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } -void Item::relayout() +void Item::retqlayout() { scheduleLayout(); } @@ -1477,11 +1477,11 @@ void Item::setHeight( int ) { int minHeight = 0; for ( uint n = 0; n < components(); ++n ) - minHeight = QMAX( minHeight, component( n )->rect().height() ); + minHeight = TQMAX( minHeight, component( n )->rect().height() ); //kdDebug(14000) << k_funcinfo << "Height is " << minHeight << endl; if ( Private::foldVisibility && d->visibilityTimer.isActive() ) { - int vis = QMIN( d->visibilityLevel, Private::visibilityFoldSteps ); + int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps ); minHeight = (minHeight * vis) / Private::visibilityFoldSteps; } KListViewItem::setHeight( minHeight ); @@ -1489,7 +1489,7 @@ void Item::setHeight( int ) int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const { - // Qt computes the itemRect from this. we want the whole item to be + // TQt computes the tqitemRect from this. we want the whole item to be // clickable, so we return the widest we could possibly be. return lv->header()->sectionSize( c ); } @@ -1503,11 +1503,11 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // set the alternate cell background colour if necessary TQColorGroup _cg = cg; if (isAlternate()) - if (listView()->viewport()->backgroundMode()==Qt::FixedColor) + if (listView()->viewport()->backgroundMode()==TQt::FixedColor) _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); else _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); - // PASTED FROM QLISTVIEWITEM + // PASTED FROM TQLISTVIEWITEM { TQPainter *p = &paint; @@ -1519,7 +1519,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // any text we render is done by the Components, not by this class, so make sure we've nothing to write TQString t; - // removed text truncating code from Qt - we do that differently, further on + // removed text truncating code from TQt - we do that differently, further on int marg = lv->itemMargin(); int r = marg; @@ -1528,20 +1528,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { // all copied from TQListView::paintEmptyArea //lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); - TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and QHeader + TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and TQHeader TQStyle::SFlags how = TQStyle::Style_Default; if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->style().drawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -1552,20 +1552,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt (column == 0 || lv->allColumnsShowFocus()) ) { p->fillRect( r - marg, 0, width - r + marg, height(), _cg.brush( TQColorGroup::Highlight ) ); - // removed text pen setting code from Qt + // removed text pen setting code from TQt } - // removed icon drawing code from Qt + // removed icon drawing code from TQt // draw the tree gubbins if ( multiLinesEnabled() && column == 0 && isOpen() && childCount() ) { int textheight = fm.size( align, t ).height() + 2 * lv->itemMargin(); - textheight = QMAX( textheight, TQApplication::globalStrut().height() ); + textheight = TQMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, @@ -1589,7 +1589,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt float opac = 1.0; if ( d->visibilityTimer.isActive() && Private::fadeVisibility ) { - int vis = QMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); + int vis = TQMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); opac = float(vis) / Private::visibilityFadeSteps; } opac *= opacity(); diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index 77d06540..ac19c4b8 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -1,5 +1,5 @@ /* - kopetelistviewitem.h - Kopete's modular QListViewItems + kopetelistviewitem.h - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN <engin@bzzzt.biz> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> @@ -44,9 +44,9 @@ public: Component *componentAt( const TQPoint &pt ); /** Repaint this item */ - virtual void repaint() = 0; - /** Relayout this item */ - virtual void relayout() = 0; + virtual void tqrepaint() = 0; + /** Retqlayout this item */ + virtual void retqlayout() = 0; /** * Get the tool tip string and rectangle for a tip request at position @@ -64,7 +64,7 @@ protected: virtual void componentRemoved( Component *component ); /** A child item has been resized */ virtual void componentResized( Component *component ); - /** Remove all children */ + /** Remove all tqchildren */ virtual void clear(); /** @internal animate items */ @@ -102,7 +102,7 @@ public: class Component : public ComponentBase { protected: - Component( ComponentBase *parent ); + Component( ComponentBase *tqparent ); public: virtual ~Component() = 0; @@ -110,18 +110,18 @@ 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 parent item. + * passed to the paint() function by the tqparent item. */ - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); /** * Paint this item, inside the rectangle returned by rect(). - * The default implementation calls paint on all children. + * The default implementation calls paint on all tqchildren. */ virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); /** * @return the rect this component was allocated last time it was laid out @@ -181,8 +181,8 @@ public: /** * RTTI: Runtime Type Information - * Exactly the same as Qt's approach to identify types of - * QCanvasItems. + * Exactly the same as TQt's approach to identify types of + * TQCanvasItems. */ enum RttiValues { @@ -196,20 +196,20 @@ public: protected: /** * Change the minimum width, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @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 relayout, - * since the parent component will do that for you. + * the existing values. if it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinWidth( int width ); /** * Change the minimum height, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @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 relayout, - * since the parent component will do that for you. + * the existing values. If it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinHeight( int height ); @@ -232,11 +232,11 @@ private: class BoxComponent : public Component { public: - enum Direction { Horizontal, Vertical }; - BoxComponent( ComponentBase *parent, Direction dir = Horizontal ); + enum Direction {Horizontal,Vertical }; + BoxComponent( ComponentBase *tqparent, Direction dir =Horizontal ); ~BoxComponent(); - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); virtual int widthForHeight( int height ); virtual int heightForWidth( int width ); @@ -262,12 +262,12 @@ private: class ContactBoxComponent : public BoxComponent { public: - ContactBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + ContactBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~ContactBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -285,12 +285,12 @@ private: class GroupBoxComponent : public BoxComponent { public: - GroupBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + GroupBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~GroupBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -305,7 +305,7 @@ private: class TextComponent : public Component { public: - TextComponent( ComponentBase *parent, const TQFont &font = TQFont(), const TQString &text = TQString::null ); + TextComponent( ComponentBase *tqparent, const TQFont &font = TQFont(), const TQString &text = TQString() ); ~TextComponent(); TQString text(); @@ -335,8 +335,8 @@ private: class ImageComponent : public Component { public: - ImageComponent( ComponentBase *parent ); - ImageComponent( ComponentBase *parent, int minW, int minH ); + ImageComponent( ComponentBase *tqparent ); + ImageComponent( ComponentBase *tqparent, int minW, int minH ); ~ImageComponent(); virtual void setPixmap( const TQPixmap &img, bool adjustSize = true); @@ -344,7 +344,7 @@ public: virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - virtual void scale( int w, int h, TQImage::ScaleMode ); + virtual void scale( int w, int h, TQ_ScaleMode ); static int RTTI; virtual int rtti() const { return RTTI; } protected: @@ -358,8 +358,8 @@ protected: class FaceComponent : public ImageComponent { public: - FaceComponent(ComponentBase *parent): ImageComponent(parent) {} - FaceComponent(ComponentBase *parent, int minW, int minH): ImageComponent(parent, minH, minW) {} + FaceComponent(ComponentBase *tqparent): ImageComponent(tqparent) {} + FaceComponent(ComponentBase *tqparent, int minW, int minH): ImageComponent(tqparent, 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 *parent, Kopete::Contact *contact, int iconSize); + ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int iconSize); ~ContactComponent(); void updatePixmap(); Kopete::Contact *contact(); @@ -387,7 +387,7 @@ protected: class SpacerComponent : public Component { public: - SpacerComponent( ComponentBase *parent, int w, int h ); + SpacerComponent( ComponentBase *tqparent, int w, int h ); }; /** @@ -400,13 +400,13 @@ public: /** * Constructor */ - DisplayNameComponent( ComponentBase *parent ); + DisplayNameComponent( ComponentBase *tqparent ); /** * Dtor */ ~DisplayNameComponent(); - void layout( const TQRect& rect ); + void tqlayout( const TQRect& rect ); TQString text(); void setText( const TQString& text ); @@ -428,7 +428,7 @@ private: class HSpacerComponent : public Component { public: - HSpacerComponent( ComponentBase *parent ); + HSpacerComponent( ComponentBase *tqparent ); int widthForHeight( int ); static int RTTI; @@ -438,7 +438,7 @@ public: class VSpacerComponent : public Component { public: - VSpacerComponent( ComponentBase *parent ); + VSpacerComponent( ComponentBase *tqparent ); int heightForWidth( int ); static int RTTI; @@ -454,13 +454,14 @@ public: class Item : public TQObject, public KListViewItem, public ComponentBase { Q_OBJECT + TQ_OBJECT public: - Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 ); - Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListViewItem *tqparent, TQObject *owner = 0, const char *name = 0 ); ~Item(); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); void setup(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp index edb63ffc..1ab9c398 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 *parent, ListView *listView, const char *name ) - : KListViewSearchLine( parent, listView, name ) +SearchLine::SearchLine( TQWidget *tqparent, ListView *listView, const char *name ) + : KListViewSearchLine( tqparent, listView, name ) { } -SearchLine::SearchLine(TQWidget *parent, const char *name) - : KListViewSearchLine( parent, 0, name ) +SearchLine::SearchLine(TQWidget *tqparent, const char *name) + : KListViewSearchLine( tqparent, 0, name ) { } @@ -67,7 +67,7 @@ void SearchLine::updateSearch( const TQString &s ) for( TQListViewItemIterator it(listView(), TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); it.current() && !currentItem; ++it ) { - if( listView()->itemRect( it.current() ).isValid() ) + if( listView()->tqitemRect( it.current() ).isValid() ) currentItem = it.current(); } } diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h index be7fc317..799337e8 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.h +++ b/kopete/libkopete/ui/kopetelistviewsearchline.h @@ -29,6 +29,7 @@ class ListView; class SearchLine : public KListViewSearchLine { Q_OBJECT + TQ_OBJECT public: /** * Constructs a SearchLine with \a listView being the @@ -37,12 +38,12 @@ public: * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 ); + SearchLine( TQWidget *tqparent, 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 *parent, const char *name); + SearchLine(TQWidget *tqparent, const char *name); /** * Destroys the SearchLine. */ diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 7ba4dff9..40a94ca8 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KopetePasswordDialog</class> <author>Olivier Goffart</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopetePasswordDialog</cstring> </property> @@ -17,15 +17,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_image</cstring> </property> @@ -48,15 +48,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -74,7 +74,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_save_passwd</cstring> </property> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -105,5 +105,5 @@ <tabstop>m_password</tabstop> <tabstop>m_save_passwd</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp index 52921b16..dd798363 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 *parent, const char *name, Kopete::Password *from ) - : KopetePasswordWidgetBase( parent, name ), d( new Private ) +Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *tqparent, const char *name, Kopete::Password *from ) + : KopetePasswordWidgetBase( tqparent, name ), d( new Private ) { load( from ); } @@ -49,7 +49,7 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source ) { mRemembered->setTristate(); mRemembered->setNoChange(); - source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) ); + source->requestWithoutPrompt( TQT_TQOBJECT(this), TQT_SLOT( receivePassword( const TQString & ) ) ); } else { diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h index 72834bff..e8c45a90 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.h +++ b/kopete/libkopete/ui/kopetepasswordwidget.h @@ -37,15 +37,16 @@ namespace UI class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase { Q_OBJECT + TQ_OBJECT public: /** * Creates a Kopete::PasswordWidget. - * @param parent The widget to nest this one inside - * @param name The name of this QObject + * @param tqparent 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 *parent, const char *name = 0, Kopete::Password *from = 0 ); + PasswordWidget( TQWidget *tqparent, const char *name = 0, Kopete::Password *from = 0 ); ~PasswordWidget(); /** diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index 5f6b665a..ecdfda7a 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KopetePasswordWidgetBase</class> <author>Richard Smith <kde@metafoo.co.uk></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KopetePasswordWidgetBase</cstring> </property> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mRemembered</cstring> </property> @@ -49,14 +49,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -91,7 +91,7 @@ <tabstops> <tabstop>mRemembered</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpassdlg.h</includehint> </includehints> diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index f1595f4e..cd8f2326 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 *parent, const char *name ) +KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name ) #if KDE_IS_VERSION( 3, 3, 90 ) -: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) +: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name ) #else : KAction( KGuiItem( i18n( "&Configure Kopete..." ), - TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) + TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, 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 *parent, const char *name ) +KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name ) { - return new KopetePreferencesAction( parent, name ); + return new KopetePreferencesAction( tqparent, name ); } -KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), Qt::Key_Delete, recvr, slot, parent, name ); + return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, tqparent, name ); } #include "kopetestdaction.moc" diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h index bd323943..06bb40eb 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* parent, const char *name = 0 ); + TQObject* tqparent, const char *name = 0 ); /** * Standard action to send a single message */ static KAction *sendMessage(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a user info dialog */ static KAction *contactInfo(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a history dialog or something similar */ static KAction *viewHistory(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to initiate sending a file to a contact */ static KAction *sendFile(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to change a contacts @ref Kopete::MetaContact */ static KAction *changeMetaContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to add a group */ static KAction *addGroup(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to delete a contact */ static KAction *deleteContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, 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* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to block a contact */ static KAction *blockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to unblock a contact */ static KAction *unblockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, 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 *parent, const char *name = 0); + static KAction *preferences(KActionCollection *tqparent, const char *name = 0); }; @@ -104,9 +104,10 @@ namespace KSettings class KOPETE_EXPORT KopetePreferencesAction : public KAction { Q_OBJECT + TQ_OBJECT public: - KopetePreferencesAction( KActionCollection *parent, const char *name = 0 ); + KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 ); ~KopetePreferencesAction(); protected slots: diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h index c54b1dba..99655e39 100644 --- a/kopete/libkopete/ui/kopeteview.h +++ b/kopete/libkopete/ui/kopeteview.h @@ -31,7 +31,7 @@ namespace Kopete /** * @author Jason Keirstead * - * Abstract parent class for all types of views used for messaging.These view objects + * Abstract tqparent 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 *parent ); + KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *tqparent ); virtual ~KopeteView(); /** diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index 843fe939..d1d0375e 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 *parent, const char *name ) : - Kopete::Plugin( instance, parent, name ) +Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *tqparent, const char *name ) : + Kopete::Plugin( instance, tqparent, name ) { } diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index 25ce704b..ccef3950 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 *parent = 0L, const char *name = 0L ); + ViewPlugin( KInstance *instance, TQObject *tqparent = 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 916b0faf..e424dc45 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -13,7 +13,7 @@ #include <kstandarddirs.h> #endif -class KopeteWidgets : public QWidgetPlugin +class KopeteWidgets : public TQWidgetPlugin { public: KopeteWidgets(); @@ -28,7 +28,7 @@ public: return result; } - virtual TQWidget *create(const TQString &key, TQWidget *parent = 0, const char *name = 0); + virtual TQWidget *create(const TQString &key, TQWidget *tqparent = 0, const char *name = 0); virtual TQIconSet iconSet(const TQString &key) const { @@ -36,7 +36,7 @@ public: TQPixmap pix(m_widgets[key].iconSet); #else TQPixmap pix(locate( "data", - TQString::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); + TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); #endif return TQIconSet(pix); } @@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets() { WidgetInfo widget; - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png"); #endif - widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h"); - widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)"); - widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector"); + widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h"); + widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector"); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); - widget.group = TQString::fromLatin1("Views (Kopete)"); + widget.group = TQString::tqfromLatin1("Views (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistview.h"); - widget.toolTip = TQString::fromLatin1("List View (Kopete)"); - widget.whatsThis = TQString::fromLatin1("A component capable list view widget."); + widget.includeFile = TQString::tqfromLatin1("kopetelistview.h"); + widget.toolTip = TQString::tqfromLatin1("List View (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget); - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistviewsearchline.h"); - widget.toolTip = TQString::fromLatin1("List View Search Line (Kopete)"); - widget.whatsThis = TQString::fromLatin1("Search line able to use Kopete custom list View."); + widget.includeFile = TQString::tqfromLatin1("kopetelistviewsearchline.h"); + widget.toolTip = TQString::tqfromLatin1("List View Search Line (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("Search line able to use Kopete custom list View."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"), widget); new KInstance("kopetewidgets"); } @@ -113,19 +113,19 @@ KopeteWidgets::~KopeteWidgets() { } -TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name) +TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *tqparent, const char *name) { - if (key == TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget")) - return new Kopete::UI::AddressBookLinkWidget(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget")) + return new Kopete::UI::AddressBookLinkWidget(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView")) - return new Kopete::UI::ListView::ListView(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView")) + return new Kopete::UI::ListView::ListView(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine")) - return new Kopete::UI::ListView::SearchLine(parent, 0, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine")) + return new Kopete::UI::ListView::SearchLine(tqparent, 0, name); return 0; } -KDE_Q_EXPORT_PLUGIN(KopeteWidgets) +KDE_TQ_EXPORT_PLUGIN(KopeteWidgets) diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 34a4c35c..61a4f14e 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -68,7 +68,7 @@ public: }; -MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(parent, owner, name) , d( new Private() ) +MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(tqparent, owner, name) , d( new Private() ) { d->metaContact = mc; d->photoSize = 60; @@ -112,12 +112,12 @@ void MetaContactSelectorWidgetLVI::slotPhotoChanged() { int photoSize = d->photoSize; - photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ) ; + photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ) ; // draw a 1 pixel black border photoPixmap = photoImg; TQPainter p(&photoPixmap); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(0, 0, photoPixmap.width()-1, 0); p.drawLine(0, photoPixmap.height()-1, photoPixmap.width()-1, photoPixmap.height()-1); p.drawLine(0, 0, 0, photoPixmap.height()-1); @@ -181,8 +181,8 @@ public: }; -MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), d( new Private() ) +MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), d( new Private() ) { TQBoxLayout *l = new TQVBoxLayout(this); d->widget = new MetaContactSelectorWidget_Base(this); @@ -244,7 +244,7 @@ void MetaContactSelectorWidget::selectMetaContact( Kopete::MetaContact *mc ) void MetaContactSelectorWidget::excludeMetaContact( Kopete::MetaContact *mc ) { - if( d->excludedMetaContacts.findIndex(mc) == -1 ) + if( d->excludedMetaContacts.tqfindIndex(mc) == -1 ) { d->excludedMetaContacts.append(mc); } @@ -264,7 +264,7 @@ void MetaContactSelectorWidget::slotLoadMetaContacts() TQPtrList<Kopete::MetaContact> metaContacts = Kopete::ContactList::self()->metaContacts(); for( Kopete::MetaContact *mc = metaContacts.first(); mc ; mc = metaContacts.next() ) { - if( !mc->isTemporary() && (d->excludedMetaContacts.findIndex(mc) == -1) ) + if( !mc->isTemporary() && (d->excludedMetaContacts.tqfindIndex(mc) == -1) ) { new MetaContactSelectorWidgetLVI(mc, d->widget->metaContactListView); } diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h index a265f665..cc30f83f 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.h +++ b/kopete/libkopete/ui/metacontactselectorwidget.h @@ -35,11 +35,12 @@ namespace UI * This class provides a widget which allows easy selection * of available Kopete metacontacts. */ -class KOPETE_EXPORT MetaContactSelectorWidget : public QWidget +class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + MetaContactSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~MetaContactSelectorWidget(); Kopete::MetaContact* metaContact(); /** @@ -80,8 +81,9 @@ private: class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 ); + MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); Kopete::MetaContact* metaContact(); virtual TQString text ( int column ) const; protected slots: diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index bc1a38eb..1fd35317 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MetaContactSelectorWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MetaContactSelectorWidget_Base</cstring> </property> @@ -40,15 +40,15 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblSearch</cstring> </property> @@ -95,10 +95,10 @@ <includes> <include location="local" impldecl="in declaration">kopetelistviewsearchline.h</include> <include location="local" impldecl="in declaration">kopetelistview.h</include> - <include location="global" impldecl="in declaration">qheader.h</include> + <include location="global" impldecl="in declaration">tqheader.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kopetelistviewsearchline.h</includehint> diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 0ad7d9c2..0b642e7b 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -59,7 +59,7 @@ struct UserInfoDialog::UserInfoDialogPrivate { }; UserInfoDialog::UserInfoDialog( const TQString& descr ) -: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).arg( descr ), KDialogBase::Ok ) +: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).tqarg( descr ), KDialogBase::Ok ) { d = new UserInfoDialogPrivate; d->page = new TQWidget( this ); @@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg ) d->awayMessage = msg; } -void UserInfoDialog::setStatus( const TQString& status ) +void UserInfoDialog::settqStatus( const TQString& status ) { d->status = status; } @@ -138,7 +138,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex TQHBox *box = new TQHBox( d->page ); new TQLabel( label, box ); edit = new KLineEdit( box ); - edit->setAlignment( Qt::AlignHCenter ); + edit->tqsetAlignment( TQt::AlignHCenter ); edit->setText( text ); edit->setReadOnly( true ); return box; @@ -182,7 +182,7 @@ void UserInfoDialog::fillHTML() } if ( d->status.isEmpty() ) { - text.append( "<div id=\"status\"><b>" + i18n("Status : ") + "</b>" ); + text.append( "<div id=\"status\"><b>" + i18n("tqStatus : ") + "</b>" ); text.append( d->status + "</div><br>" ); } @@ -214,7 +214,7 @@ void UserInfoDialog::fillWidgets() } if ( !d->status.isEmpty() ) { - d->topLayout->addWidget( addLabelEdit( i18n("Status:"), d->status, d->statusEdit ) ); + d->topLayout->addWidget( addLabelEdit( i18n("tqStatus:"), d->status, d->statusEdit ) ); } if ( !d->warningLevel.isEmpty() ) { diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h index 246d15ec..5926ab5a 100644 --- a/kopete/libkopete/ui/userinfodialog.h +++ b/kopete/libkopete/ui/userinfodialog.h @@ -30,6 +30,7 @@ namespace Kopete { class KOPETE_EXPORT UserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UserInfoDialog( const TQString& descr ); virtual ~UserInfoDialog(); @@ -49,7 +50,7 @@ namespace Kopete { void setName( const TQString& name ); void setId( const TQString& id ); void setAwayMessage( const TQString& msg ); - void setStatus( const TQString& status ); + void settqStatus( const TQString& status ); void setWarningLevel(const TQString& level ); void setOnlineSince( const TQString& since ); void setInfo( const TQString& info ); diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp index ad701b8e..0e47a0d4 100644 --- a/kopete/libkopete/webcamwidget.cpp +++ b/kopete/libkopete/webcamwidget.cpp @@ -23,8 +23,8 @@ namespace Kopete { -WebcamWidget::WebcamWidget( TQWidget* parent, const char* name ) -: TQWidget( parent, name ) +WebcamWidget::WebcamWidget( TQWidget* tqparent, const char* name ) +: TQWidget( tqparent, name ) { clear(); } @@ -67,13 +67,13 @@ void WebcamWidget::setText(const TQString& text) void WebcamWidget::paintEvent( TQPaintEvent* event ) { - TQMemArray<TQRect> rects = event->region().rects(); + TQMemArray<TQRect> rects = TQRegion(event->region()).tqrects(); if (!mPixmap.isNull()) { for (unsigned int i = 0; i < rects.count(); ++i) { - bitBlt(this, rects[i].topLeft(), &mPixmap, rects[i], Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), rects[i].topLeft(), TQT_TQPAINTDEVICE(&mPixmap), rects[i], TQt::CopyROP, true); } } else @@ -88,17 +88,17 @@ void WebcamWidget::paintEvent( TQPaintEvent* event ) // TODO: draw the text TQPainter p(this); - TQRect r = p.boundingRect(rect(), Qt::AlignCenter | Qt::WordBreak, mText ); + TQRect r = p.boundingRect(rect(), TQt::AlignCenter | TQt::WordBreak, mText ); if ( !mText.isEmpty() && event->rect().intersects(r)) { - p.setPen(Qt::black); + p.setPen(TQt::black); TQRect rec = rect(); rec.moveTopLeft(TQPoint(1,1)); - p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); + p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); rec.moveTopLeft(TQPoint(-1,-1)); - p.setPen(Qt::white); - p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); + p.setPen(TQt::white); + p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); } } diff --git a/kopete/libkopete/webcamwidget.h b/kopete/libkopete/webcamwidget.h index fdc60a6e..663c7723 100644 --- a/kopete/libkopete/webcamwidget.h +++ b/kopete/libkopete/webcamwidget.h @@ -28,16 +28,17 @@ namespace Kopete /** * A simple widget to display webcam frames. */ -class KOPETE_EXPORT WebcamWidget : public QWidget +class KOPETE_EXPORT WebcamWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * @brief WebcamWidget constructor. - * @param parent The parent widget of this widget - * @param name The name for this QObject + * @param tqparent The tqparent widget of this widget + * @param name The name for this TQObject */ - WebcamWidget( TQWidget* parent = 0, const char* name = 0 ); + WebcamWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~WebcamWidget(); /** @@ -56,8 +57,11 @@ public: * @param text The text to be displayed */ void setText(const TQString& text); + protected slots: void paintEvent( TQPaintEvent* event ); + +protected: TQPixmap mPixmap; TQString mText; }; |