summaryrefslogtreecommitdiffstats
path: root/kontact/interfaces
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
commit7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch)
tree8474f9b444b2756228600050f07a7ff25de532b2 /kontact/interfaces
parentf587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff)
downloadtdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz
tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/interfaces')
-rw-r--r--kontact/interfaces/core.cpp34
-rw-r--r--kontact/interfaces/core.h18
-rw-r--r--kontact/interfaces/plugin.cpp56
-rw-r--r--kontact/interfaces/plugin.h46
-rw-r--r--kontact/interfaces/summary.cpp48
-rw-r--r--kontact/interfaces/summary.h26
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp24
-rw-r--r--kontact/interfaces/uniqueapphandler.h2
8 files changed, 127 insertions, 127 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 19ed8bade..6d048504b 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -26,7 +26,7 @@
#include <kparts/part.h>
#include <kparts/componentfactory.h>
#include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <klocale.h>
using namespace Kontact;
@@ -34,16 +34,16 @@ using namespace Kontact;
class Core::Private
{
public:
- QString lastErrorMessage;
+ TQString lastErrorMessage;
};
-Core::Core( QWidget *parent, const char *name )
+Core::Core( TQWidget *parent, const char *name )
: KParts::MainWindow( parent, name )
{
d = new Private;
- QTimer* timer = new QTimer( this );
- mLastDate = QDate::currentDate();
- connect(timer, SIGNAL( timeout() ), SLOT( checkNewDay() ) );
+ TQTimer* timer = new TQTimer( this );
+ mLastDate = TQDate::currentDate();
+ connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
timer->start( 1000*60 );
}
@@ -56,7 +56,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
{
kdDebug(5601) << "Core::createPart(): " << libname << endl;
- QMap<QCString,KParts::ReadOnlyPart *>::ConstIterator it;
+ TQMap<TQCString,KParts::ReadOnlyPart *>::ConstIterator it;
it = mParts.find( libname );
if ( it != mParts.end() ) return it.data();
@@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
KParts::ReadOnlyPart *part =
KParts::ComponentFactory::
createPartInstanceFromLibrary<KParts::ReadOnlyPart>
- ( libname, this, 0, this, "kontact", QStringList(), &error );
+ ( libname, this, 0, this, "kontact", TQStringList(), &error );
KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part );
if ( pimPart ) {
mParts.insert( libname, pimPart );
- QObject::connect( pimPart, SIGNAL( destroyed( QObject * ) ),
- SLOT( slotPartDestroyed( QObject * ) ) );
+ TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ),
+ TQT_SLOT( slotPartDestroyed( TQObject * ) ) );
} else {
// TODO move to KParts::ComponentFactory
switch( error ) {
@@ -98,12 +98,12 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
return pimPart;
}
-void Core::slotPartDestroyed( QObject * obj )
+void Core::slotPartDestroyed( TQObject * obj )
{
// the part was deleted, we need to remove it from the part map to not return
// a dangling pointer in createPart
- QMap<QCString, KParts::ReadOnlyPart*>::Iterator end = mParts.end();
- QMap<QCString, KParts::ReadOnlyPart*>::Iterator it = mParts.begin();
+ TQMap<TQCString, KParts::ReadOnlyPart*>::Iterator end = mParts.end();
+ TQMap<TQCString, KParts::ReadOnlyPart*>::Iterator it = mParts.begin();
for ( ; it != end; ++it ) {
if ( it.data() == obj ) {
mParts.remove( it );
@@ -114,13 +114,13 @@ void Core::slotPartDestroyed( QObject * obj )
void Core::checkNewDay()
{
- if ( mLastDate != QDate::currentDate() )
- emit dayChanged( QDate::currentDate() );
+ if ( mLastDate != TQDate::currentDate() )
+ emit dayChanged( TQDate::currentDate() );
- mLastDate = QDate::currentDate();
+ mLastDate = TQDate::currentDate();
}
-QString Core::lastErrorMessage() const
+TQString Core::lastErrorMessage() const
{
return d->lastErrorMessage;
}
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2ebe088f9..2d75fb227 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -23,7 +23,7 @@
#ifndef KONTACT_CORE_H
#define KONTACT_CORE_H
-#include <qdatetime.h>
+#include <tqdatetime.h>
#include <kdepimmacros.h>
#include <kparts/mainwindow.h>
#include <kparts/part.h>
@@ -54,12 +54,12 @@ class KDE_EXPORT Core : public KParts::MainWindow
This is an overloaded member function. It behaves essentially like the
above function.
*/
- virtual void selectPlugin( const QString &plugin ) = 0;
+ virtual void selectPlugin( const TQString &plugin ) = 0;
/**
Returns the pointer list of available plugins.
*/
- virtual QValueList<Kontact::Plugin*> pluginList() const = 0;
+ virtual TQValueList<Kontact::Plugin*> pluginList() const = 0;
/**
@internal (for Plugin)
@@ -76,20 +76,20 @@ class KDE_EXPORT Core : public KParts::MainWindow
/**
Emitted when a new day starts
*/
- void dayChanged( const QDate& );
+ void dayChanged( const TQDate& );
protected:
- Core( QWidget *parentWidget = 0, const char *name = 0 );
+ Core( TQWidget *parentWidget = 0, const char *name = 0 );
- QString lastErrorMessage() const;
+ TQString lastErrorMessage() const;
private slots:
- void slotPartDestroyed( QObject * );
+ void slotPartDestroyed( TQObject * );
void checkNewDay();
private:
- QMap<QCString,KParts::ReadOnlyPart *> mParts;
- QDate mLastDate;
+ TQMap<TQCString,KParts::ReadOnlyPart *> mParts;
+ TQDate mLastDate;
class Private;
Private *d;
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 33662015c..6025664f1 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -40,29 +40,29 @@ class Plugin::Private
public:
Kontact::Core *core;
DCOPClient *dcopClient;
- QPtrList<KAction> *newActions;
- QPtrList<KAction> *syncActions;
- QString identifier;
- QString title;
- QString icon;
- QString executableName;
- QCString partLibraryName;
+ TQPtrList<KAction> *newActions;
+ TQPtrList<KAction> *syncActions;
+ TQString identifier;
+ TQString title;
+ TQString icon;
+ TQString executableName;
+ TQCString partLibraryName;
bool hasPart;
KParts::ReadOnlyPart *part;
bool disabled;
};
-Plugin::Plugin( Kontact::Core *core, QObject *parent, const char *name )
- : KXMLGUIClient( core ), QObject( parent, name ), d( new Private )
+Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name )
+ : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private )
{
core->factory()->addClient( this );
KGlobal::locale()->insertCatalogue(name);
d->core = core;
d->dcopClient = 0;
- d->newActions = new QPtrList<KAction>;
- d->syncActions = new QPtrList<KAction>;
+ d->newActions = new TQPtrList<KAction>;
+ d->syncActions = new TQPtrList<KAction>;
d->hasPart = true;
d->part = 0;
d->disabled = false;
@@ -76,47 +76,47 @@ Plugin::~Plugin()
delete d;
}
-void Plugin::setIdentifier( const QString &identifier )
+void Plugin::setIdentifier( const TQString &identifier )
{
d->identifier = identifier;
}
-QString Plugin::identifier() const
+TQString Plugin::identifier() const
{
return d->identifier;
}
-void Plugin::setTitle( const QString &title )
+void Plugin::setTitle( const TQString &title )
{
d->title = title;
}
-QString Plugin::title() const
+TQString Plugin::title() const
{
return d->title;
}
-void Plugin::setIcon( const QString &icon )
+void Plugin::setIcon( const TQString &icon )
{
d->icon = icon;
}
-QString Plugin::icon() const
+TQString Plugin::icon() const
{
return d->icon;
}
-void Plugin::setExecutableName( const QString& bin )
+void Plugin::setExecutableName( const TQString& bin )
{
d->executableName = bin;
}
-QString Plugin::executableName() const
+TQString Plugin::executableName() const
{
return d->executableName;
}
-void Plugin::setPartLibraryName( const QCString &libName )
+void Plugin::setPartLibraryName( const TQCString &libName )
{
d->partLibraryName = libName;
}
@@ -147,16 +147,16 @@ KParts::ReadOnlyPart *Plugin::part()
if ( !d->part ) {
d->part = createPart();
if ( d->part ) {
- connect( d->part, SIGNAL( destroyed() ), SLOT( partDestroyed() ) );
+ connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) );
core()->partLoaded( this, d->part );
}
}
return d->part;
}
-QString Plugin::tipFile() const
+TQString Plugin::tipFile() const
{
- return QString::null;
+ return TQString::null;
}
@@ -183,12 +183,12 @@ void Plugin::insertSyncAction( KAction *action )
d->syncActions->append( action );
}
-QPtrList<KAction> *Plugin::newActions() const
+TQPtrList<KAction> *Plugin::newActions() const
{
return d->newActions;
}
-QPtrList<KAction> *Plugin::syncActions() const
+TQPtrList<KAction> *Plugin::syncActions() const
{
return d->syncActions;
}
@@ -242,11 +242,11 @@ bool Kontact::Plugin::disabled() const
return d->disabled;
}
-void Kontact::Plugin::loadProfile( const QString& )
+void Kontact::Plugin::loadProfile( const TQString& )
{
}
-void Kontact::Plugin::saveToProfile( const QString& ) const
+void Kontact::Plugin::saveToProfile( const TQString& ) const
{
}
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index c80227984..f3b44431d 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -24,10 +24,10 @@
#ifndef KONTACT_PLUGIN_H
#define KONTACT_PLUGIN_H
-#include <qobject.h>
+#include <tqobject.h>
#include <kxmlguiclient.h>
#include <kdepimmacros.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
class QStringList;
class DCOPClient;
@@ -55,7 +55,7 @@ class Summary;
to get a plugin. It can insert an icon into the sidepane,
add widgets to the widgetstack and add menu items via XMLGUI.
*/
-class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient
+class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
{
Q_OBJECT
@@ -68,61 +68,61 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient
provides the part! This is the name used for DCOP registration.
It's ok to have several plugins using the same application name.
*/
- Plugin( Core *core, QObject *parent, const char *name );
+ Plugin( Core *core, TQObject *parent, const char *name );
~Plugin();
/**
Sets the identifier.
*/
- void setIdentifier( const QString &identifier );
+ void setIdentifier( const TQString &identifier );
/**
Returns the identifier. It is used as argument for several
methods of Kontacts core.
*/
- QString identifier() const;
+ TQString identifier() const;
/**
Sets the localized title.
*/
- void setTitle( const QString &title );
+ void setTitle( const TQString &title );
/**
Returns the localized title.
*/
- QString title() const;
+ TQString title() const;
/**
Sets the icon name.
*/
- void setIcon( const QString &icon );
+ void setIcon( const TQString &icon );
/**
Returns the icon name.
*/
- QString icon() const;
+ TQString icon() const;
/**
Sets the name of executable (if existant).
*/
- void setExecutableName( const QString &bin );
+ void setExecutableName( const TQString &bin );
/**
Returns the name of the binary (if existant).
*/
- QString executableName() const;
+ TQString executableName() const;
/**
Set name of library which contains the KPart used by this plugin.
*/
- void setPartLibraryName( const QCString & );
+ void setPartLibraryName( const TQCString & );
/**
Create the DCOP interface for the given @p serviceType, if this
plugin provides it. Return false otherwise.
*/
- virtual bool createDCOPInterface( const QString& /*serviceType*/ ) { return false; }
+ virtual bool createDCOPInterface( const TQString& /*serviceType*/ ) { return false; }
/**
Reimplement this method and return wether a standalone application is still running
@@ -153,7 +153,7 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient
/**
Reimplement this method and return the a path relative to "data" to the tips file.
*/
- virtual QString tipFile() const;
+ virtual TQString tipFile() const;
/**
This function is called when the plugin is selected by the user before the
@@ -171,7 +171,7 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient
Reimplement this method if you want to add a widget for your application
to Kontact's summary page.
*/
- virtual Summary *createSummaryWidget( QWidget * /*parent*/ ) { return 0; }
+ virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
/**
Returns wether the plugin provides a part that should be shown in the sidebar.
@@ -220,31 +220,31 @@ class KDE_EXPORT Plugin : public QObject, virtual public KXMLGUIClient
/**
FIXME: write API doc for Kontact::Plugin::newActions().
*/
- QPtrList<KAction>* newActions() const;
+ TQPtrList<KAction>* newActions() const;
/**
FIXME: write API doc for Kontact::Plugin::syncActions().
*/
- QPtrList<KAction>* syncActions() const;
+ TQPtrList<KAction>* syncActions() const;
/**
Returns a list of action name which shall be hidden in the main toolbar.
*/
- virtual QStringList invisibleToolbarActions() const { return QStringList(); }
+ virtual TQStringList invisibleToolbarActions() const { return TQStringList(); }
/**
Return, if the plugin can handle the drag object of the given mime type.
*/
- virtual bool canDecodeDrag( QMimeSource * ) { return false; }
+ virtual bool canDecodeDrag( TQMimeSource * ) { return false; }
/**
Process drop event.
*/
- virtual void processDropEvent( QDropEvent * ) {}
+ virtual void processDropEvent( TQDropEvent * ) {}
- virtual void loadProfile( const QString& directoryPath );
+ virtual void loadProfile( const TQString& directoryPath );
- virtual void saveToProfile( const QString& directoryPath ) const;
+ virtual void saveToProfile( const TQString& directoryPath ) const;
/**
* Session management: read properties
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index f4e38771d..da978d6e2 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -22,20 +22,20 @@
#include "summary.h"
-#include <qimage.h>
-#include <qdragobject.h>
-#include <qhbox.h>
-#include <qfont.h>
-#include <qlabel.h>
-#include <qpainter.h>
+#include <tqimage.h>
+#include <tqdragobject.h>
+#include <tqhbox.h>
+#include <tqfont.h>
+#include <tqlabel.h>
+#include <tqpainter.h>
#include <kiconloader.h>
#include <kdialog.h>
using namespace Kontact;
-Summary::Summary( QWidget *parent, const char *name )
- : QWidget( parent, name )
+Summary::Summary( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
setAcceptDrops( true );
}
@@ -44,22 +44,22 @@ Summary::~Summary()
{
}
-QWidget* Summary::createHeader(QWidget *parent, const QPixmap& icon, const QString& heading)
+TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading)
{
- QHBox* hbox = new QHBox( parent );
+ TQHBox* hbox = new TQHBox( parent );
hbox->setMargin( 2 );
- QFont boldFont;
+ TQFont boldFont;
boldFont.setBold( true );
boldFont.setPointSize( boldFont.pointSize() + 2 );
- QLabel *label = new QLabel( hbox );
+ TQLabel *label = new TQLabel( hbox );
label->setPixmap( icon );
label->setFixedSize( label->sizeHint() );
label->setPaletteBackgroundColor( colorGroup().mid() );
label->setAcceptDrops( true );
- label = new QLabel( heading, hbox );
+ label = new TQLabel( heading, hbox );
label->setAlignment( AlignLeft|AlignVCenter );
label->setIndent( KDialog::spacingHint() );
label->setFont( boldFont );
@@ -73,25 +73,25 @@ QWidget* Summary::createHeader(QWidget *parent, const QPixmap& icon, const QStri
return hbox;
}
-void Summary::mousePressEvent( QMouseEvent *event )
+void Summary::mousePressEvent( TQMouseEvent *event )
{
mDragStartPoint = event->pos();
- QWidget::mousePressEvent( event );
+ TQWidget::mousePressEvent( event );
}
-void Summary::mouseMoveEvent( QMouseEvent *event )
+void Summary::mouseMoveEvent( TQMouseEvent *event )
{
if ( (event->state() & LeftButton) &&
(event->pos() - mDragStartPoint).manhattanLength() > 4 ) {
- QDragObject *drag = new QTextDrag( "", this, "SummaryWidgetDrag" );
+ TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" );
- QPixmap pm = QPixmap::grabWidget( this );
+ TQPixmap pm = TQPixmap::grabWidget( this );
if ( pm.width() > 300 )
- pm = pm.convertToImage().smoothScale( 300, 300, QImage::ScaleMin );
+ pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
- QPainter painter;
+ TQPainter painter;
painter.begin( &pm );
painter.setPen( Qt::gray );
painter.drawRect( 0, 0, pm.width(), pm.height() );
@@ -99,15 +99,15 @@ void Summary::mouseMoveEvent( QMouseEvent *event )
drag->setPixmap( pm );
drag->dragMove();
} else
- QWidget::mouseMoveEvent( event );
+ TQWidget::mouseMoveEvent( event );
}
-void Summary::dragEnterEvent( QDragEnterEvent *event )
+void Summary::dragEnterEvent( TQDragEnterEvent *event )
{
- event->accept( QTextDrag::canDecode( event ) );
+ event->accept( TQTextDrag::canDecode( event ) );
}
-void Summary::dropEvent( QDropEvent *event )
+void Summary::dropEvent( TQDropEvent *event )
{
int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
emit summaryWidgetDropped( this, event->source(), alignment );
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 8ef96ef2c..5bbfcf2b3 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -21,8 +21,8 @@
#ifndef KONTACT_SUMMARY_H
#define KONTACT_SUMMARY_H
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
#include <kdepimmacros.h>
class KStatusBar;
@@ -38,7 +38,7 @@ class KDE_EXPORT Summary : public QWidget
Q_OBJECT
public:
- Summary( QWidget *parent, const char *name = 0 );
+ Summary( TQWidget *parent, const char *name = 0 );
virtual ~Summary();
@@ -52,15 +52,15 @@ class KDE_EXPORT Summary : public QWidget
/**
Creates a heading for a typical summary view with an icon and a heading.
*/
- QWidget *createHeader( QWidget* parent, const QPixmap &icon,
- const QString& heading );
+ TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon,
+ const TQString& heading );
/**
Return list of strings identifying configuration modules for this summary
part. The string has to be suitable for being passed to
KCMultiDialog::addModule().
*/
- virtual QStringList configModules() const { return QStringList(); }
+ virtual TQStringList configModules() const { return TQStringList(); }
public slots:
virtual void configChanged() {}
@@ -72,18 +72,18 @@ class KDE_EXPORT Summary : public QWidget
virtual void updateSummary( bool force = false ) { Q_UNUSED( force ); }
signals:
- void message( const QString &message );
- void summaryWidgetDropped( QWidget *target, QWidget *widget, int alignment );
+ void message( const TQString &message );
+ void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
protected:
- virtual void mousePressEvent( QMouseEvent* );
- virtual void mouseMoveEvent( QMouseEvent* );
- virtual void dragEnterEvent( QDragEnterEvent* );
- virtual void dropEvent( QDropEvent* );
+ virtual void mousePressEvent( TQMouseEvent* );
+ virtual void mouseMoveEvent( TQMouseEvent* );
+ virtual void dragEnterEvent( TQDragEnterEvent* );
+ virtual void dropEvent( TQDropEvent* );
private:
KStatusBar *mStatusBar;
- QPoint mDragStartPoint;
+ TQPoint mDragStartPoint;
class Private;
Private *d;
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index de77df7d5..34de01807 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -90,8 +90,8 @@ int UniqueAppHandler::newInstance()
return 0;
}
-bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data,
- QCString& replyType, QByteArray &replyData )
+bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
+ TQCString& replyType, TQByteArray &replyData )
{
if ( fun == "newInstance()" ) {
replyType = "int";
@@ -100,15 +100,15 @@ bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data,
loadCommandLineOptions(); // implemented by plugin
// This bit is duplicated from KUniqueApplication::processDelayed()
- QDataStream ds( data, IO_ReadOnly );
+ TQDataStream ds( data, IO_ReadOnly );
KCmdLineArgs::loadAppArgs( ds );
if ( !ds.atEnd() ) { // backwards compatibility
- QCString asn_id;
+ TQCString asn_id;
ds >> asn_id;
kapp->setStartupId( asn_id );
}
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << newInstance();
// OK, we're done, reload the initial kontact command line options,
@@ -121,7 +121,7 @@ bool UniqueAppHandler::process( const QCString &fun, const QByteArray &data,
replyType = "bool";
(void)mPlugin->part(); // load the part without bringing it to front
- QDataStream _replyStream( replyData, IO_WriteOnly );
+ TQDataStream _replyStream( replyData, IO_WriteOnly );
_replyStream << true;
} else {
return DCOPObject::process( fun, data, replyType, replyData );
@@ -145,7 +145,7 @@ QCStringList UniqueAppHandler::functions()
}
UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin* plugin )
- : QObject( plugin ), mFactory( factory ), mPlugin( plugin )
+ : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
{
// The app is running standalone if 1) that name is known to DCOP
mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
@@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
if ( mRunningStandalone ) {
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
- this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+ connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
} else {
mFactory->createHandler( mPlugin );
}
@@ -171,11 +171,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
delete mFactory;
}
-void UniqueAppWatcher::unregisteredFromDCOP( const QCString& appId )
+void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
{
if ( appId == mPlugin->name() && mRunningStandalone ) {
- disconnect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
- this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+ disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
kdDebug(5601) << k_funcinfo << appId << endl;
mFactory->createHandler( mPlugin );
kapp->dcopClient()->setNotifications( false );
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 23a593af6..62886cc1b 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -110,7 +110,7 @@ class KDE_EXPORT UniqueAppWatcher : public QObject
bool isRunningStandalone() const { return mRunningStandalone; }
protected slots:
- void unregisteredFromDCOP( const QCString& appId );
+ void unregisteredFromDCOP( const TQCString& appId );
private:
bool mRunningStandalone;