summaryrefslogtreecommitdiffstats
path: root/kontact/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/interfaces')
-rw-r--r--kontact/interfaces/core.cpp8
-rw-r--r--kontact/interfaces/core.h6
-rw-r--r--kontact/interfaces/plugin.cpp4
-rw-r--r--kontact/interfaces/plugin.h6
-rw-r--r--kontact/interfaces/summary.cpp4
-rw-r--r--kontact/interfaces/summary.h6
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp34
-rw-r--r--kontact/interfaces/uniqueapphandler.h8
8 files changed, 38 insertions, 38 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 3c270aa8..859e76fa 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name )
d = new Private;
TQTimer* timer = new TQTimer( this );
mLastDate = TQDate::currentDate();
- connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
+ connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) );
timer->start( 1000*60 );
}
@@ -66,13 +66,13 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
KParts::ReadOnlyPart *part =
KParts::ComponentFactory::
createPartInstanceFromLibrary<KParts::ReadOnlyPart>
- ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &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, TQT_SIGNAL( destroyed( TQObject * ) ),
- TQT_SLOT( slotPartDestroyed( TQObject * ) ) );
+ TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ),
+ TQ_SLOT( slotPartDestroyed( TQObject * ) ) );
} else {
// TODO move to KParts::ComponentFactory
switch( error ) {
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index c76406d5..cc71407c 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -24,7 +24,7 @@
#define KONTACT_CORE_H
#include <tqdatetime.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
@@ -38,9 +38,9 @@ class Plugin;
/**
This class provides the interface to the Kontact core for the plugins.
*/
-class KDE_EXPORT Core : public KParts::MainWindow
+class TDE_EXPORT Core : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Core();
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 3b63466c..b3ec8202 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -27,7 +27,7 @@
#include <tdeglobal.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <krun.h>
#include "core.h"
@@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part()
if ( !d->part ) {
d->part = createPart();
if ( d->part ) {
- connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) );
+ connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) );
core()->partLoaded( this, d->part );
}
}
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 70c8a7e2..f2911ade 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -26,7 +26,7 @@
#include <tqobject.h>
#include <kxmlguiclient.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqptrlist.h>
class TQStringList;
@@ -55,9 +55,9 @@ 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 TQObject, virtual public KXMLGUIClient
+class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 6192dd4c..c48e7889 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event )
void Summary::mouseMoveEvent( TQMouseEvent *event )
{
- if ( (event->state() & Qt::LeftButton) &&
+ if ( (event->state() & TQt::LeftButton) &&
(event->pos() - mDragStartPoint).manhattanLength() > 4 ) {
TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" );
TQPixmap pm = TQPixmap::grabWidget( this );
if ( pm.width() > 300 )
- pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+ pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
TQPainter painter;
painter.begin( &pm );
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index dba346e2..cd97525a 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqpixmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class KStatusBar;
@@ -33,9 +33,9 @@ namespace Kontact
/**
Summary widget for display in the Summary View plugin.
*/
-class KDE_EXPORT Summary : public TQWidget
+class TDE_EXPORT Summary : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 98a5d45b..7fe8633e 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -28,7 +28,7 @@
#include <dcopclient.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
/*
Test plan for the various cases of interaction between standalone apps and kontact:
@@ -78,10 +78,10 @@ using namespace Kontact;
int UniqueAppHandler::newInstance()
{
- // This bit is duplicated from KUniqueApplication::newInstance()
- if ( kapp->mainWidget() ) {
- kapp->mainWidget()->show();
- KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+ // This bit is duplicated from TDEUniqueApplication::newInstance()
+ if ( tdeApp->mainWidget() ) {
+ tdeApp->mainWidget()->show();
+ KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
TDEStartupInfo::appStarted();
}
@@ -99,13 +99,13 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
TDECmdLineArgs::reset(); // forget options defined by other "applications"
loadCommandLineOptions(); // implemented by plugin
- // This bit is duplicated from KUniqueApplication::processDelayed()
+ // This bit is duplicated from TDEUniqueApplication::processDelayed()
TQDataStream ds( data, IO_ReadOnly );
TDECmdLineArgs::loadAppArgs( ds );
if ( !ds.atEnd() ) { // backwards compatibility
TQCString asn_id;
ds >> asn_id;
- kapp->setStartupId( asn_id );
+ tdeApp->setStartupId( asn_id );
}
TQDataStream _replyStream( replyData, IO_WriteOnly );
@@ -148,16 +148,16 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, 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() );
+ mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() );
// and 2) it's not registered by kontact (e.g. in another plugin)
- if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) )
+ if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) )
mRunningStandalone = false;
if ( mRunningStandalone ) {
- kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ tdeApp->dcopClient()->setNotifications( true );
+ connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
} else {
mFactory->createHandler( mPlugin );
}
@@ -166,7 +166,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
UniqueAppWatcher::~UniqueAppWatcher()
{
if ( mRunningStandalone )
- kapp->dcopClient()->setNotifications( false );
+ tdeApp->dcopClient()->setNotifications( false );
delete mFactory;
}
@@ -174,11 +174,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
{
if ( appId == mPlugin->name() && mRunningStandalone ) {
- disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
kdDebug(5601) << k_funcinfo << appId << endl;
mFactory->createHandler( mPlugin );
- kapp->dcopClient()->setNotifications( false );
+ tdeApp->dcopClient()->setNotifications( false );
mRunningStandalone = false;
}
}
@@ -196,7 +196,7 @@ static TDECmdLineOptions options[] =
void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
{
TDECmdLineArgs::addCmdLineOptions( options );
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
TDEApplication::addCmdLineOptions();
}
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 025bb8b8..81e0b72a 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -24,7 +24,7 @@
#include <dcopobject.h>
#include <plugin.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace Kontact
{
@@ -36,7 +36,7 @@ namespace Kontact
* By default this means simply bringing the main window to the front,
* but newInstance can be reimplemented.
*/
-class KDE_EXPORT UniqueAppHandler : public DCOPObject
+class TDE_EXPORT UniqueAppHandler : public DCOPObject
{
K_DCOP
@@ -91,9 +91,9 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
* Kontact takes over from there.
*
*/
-class KDE_EXPORT UniqueAppWatcher : public TQObject
+class TDE_EXPORT UniqueAppWatcher : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 11:35:12 +0000