summaryrefslogtreecommitdiffstats
path: root/kontact/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/interfaces')
-rw-r--r--kontact/interfaces/core.cpp6
-rw-r--r--kontact/interfaces/core.h1
-rw-r--r--kontact/interfaces/plugin.cpp6
-rw-r--r--kontact/interfaces/plugin.h9
-rw-r--r--kontact/interfaces/summary.cpp12
-rw-r--r--kontact/interfaces/summary.h7
-rw-r--r--kontact/interfaces/uniqueapphandler.h9
7 files changed, 27 insertions, 23 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index e940a53c2..b77fabd25 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -37,8 +37,8 @@ public:
TQString lastErrorMessage;
};
-Core::Core( TQWidget *parent, const char *name )
- : KParts::MainWindow( parent, name )
+Core::Core( TQWidget *tqparent, const char *name )
+ : KParts::MainWindow( tqparent, name )
{
d = new Private;
TQTimer* timer = new TQTimer( this );
@@ -57,7 +57,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
kdDebug(5601) << "Core::createPart(): " << libname << endl;
TQMap<TQCString,KParts::ReadOnlyPart *>::ConstIterator it;
- it = mParts.find( libname );
+ it = mParts.tqfind( libname );
if ( it != mParts.end() ) return it.data();
kdDebug(5601) << "Creating new KPart" << endl;
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index e84b3b8d7..b060cc8a6 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -41,6 +41,7 @@ class Plugin;
class KDE_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 6025664f1..1d7a2a1a4 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -53,8 +53,8 @@ class Plugin::Private
};
-Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name )
- : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private )
+Plugin::Plugin( Kontact::Core *core, TQObject *tqparent, const char *name )
+ : KXMLGUIClient( core ), TQObject( tqparent, name ), d( new Private )
{
core->factory()->addClient( this );
KGlobal::locale()->insertCatalogue(name);
@@ -156,7 +156,7 @@ KParts::ReadOnlyPart *Plugin::part()
TQString Plugin::tipFile() const
{
- return TQString::null;
+ return TQString();
}
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 5a62beea4..f0fcc1547 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -58,6 +58,7 @@ class Summary;
class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -68,7 +69,7 @@ class KDE_EXPORT Plugin : public TQObject, 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, TQObject *parent, const char *name );
+ Plugin( Core *core, TQObject *tqparent, const char *name );
~Plugin();
@@ -114,7 +115,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
TQString executableName() const;
/**
- Set name of library which tqcontains the KPart used by this plugin.
+ Set name of library which contains the KPart used by this plugin.
*/
void setPartLibraryName( const TQCString & );
@@ -171,7 +172,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
Reimplement this method if you want to add a widget for your application
to Kontact's summary page.
*/
- virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
+ virtual Summary *createSummaryWidget( TQWidget * /*tqparent*/ ) { return 0; }
/**
Returns whether the plugin provides a part that should be shown in the sidebar.
@@ -196,7 +197,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
The clients name is taken from the name argument in the constructor.
@note: The DCOPClient object will only be created when this method is
called for the first time. Make sure that the part has been loaded
- before calling this method, if it's the one that tqcontains the DCOP
+ before calling this method, if it's the one that contains the DCOP
interface that other parts might use.
*/
DCOPClient *dcopClient() const;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 86902ca0d..0f4c048cd 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -34,8 +34,8 @@
using namespace Kontact;
-Summary::Summary( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
+Summary::Summary( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name )
{
setAcceptDrops( true );
}
@@ -44,9 +44,9 @@ Summary::~Summary()
{
}
-TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading)
+TQWidget* Summary::createHeader(TQWidget *tqparent, const TQPixmap& icon, const TQString& heading)
{
- TQHBox* hbox = new TQHBox( parent );
+ TQHBox* hbox = new TQHBox( tqparent );
hbox->setMargin( 2 );
TQFont boldFont;
@@ -93,7 +93,7 @@ void Summary::mouseMoveEvent( TQMouseEvent *event )
TQPainter painter;
painter.begin( &pm );
- painter.setPen( Qt::gray );
+ painter.setPen( TQt::gray );
painter.drawRect( 0, 0, pm.width(), pm.height() );
painter.end();
drag->setPixmap( pm );
@@ -109,7 +109,7 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
void Summary::dropEvent( TQDropEvent *event )
{
- int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
+ int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
emit summaryWidgetDropped( this, event->source(), tqalignment );
}
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 29a890190..a845401fc 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -33,12 +33,13 @@ namespace Kontact
/**
Summary widget for display in the Summary View plugin.
*/
-class KDE_EXPORT Summary : public QWidget
+class KDE_EXPORT Summary : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- Summary( TQWidget *parent, const char *name = 0 );
+ Summary( TQWidget *tqparent, const char *name = 0 );
virtual ~Summary();
@@ -52,7 +53,7 @@ class KDE_EXPORT Summary : public QWidget
/**
Creates a heading for a typical summary view with an icon and a heading.
*/
- TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon,
+ TQWidget *createHeader( TQWidget* tqparent, const TQPixmap &icon,
const TQString& heading );
/**
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 62886cc1b..b93b59657 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KONTACT_UNIQUEAPPHANDLER_H
-#define KONTACT_UNIQUEAPPHANDLER_H
+#ifndef KONTACT_UNITQUEAPPHANDLER_H
+#define KONTACT_UNITQUEAPPHANDLER_H
#include <dcopobject.h>
#include <plugin.h>
@@ -89,9 +89,10 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
* Kontact takes over from there.
*
*/
-class KDE_EXPORT UniqueAppWatcher : public QObject
+class KDE_EXPORT UniqueAppWatcher : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -120,4 +121,4 @@ class KDE_EXPORT UniqueAppWatcher : public QObject
} // namespace
-#endif /* KONTACT_UNIQUEAPPHANDLER_H */
+#endif /* KONTACT_UNITQUEAPPHANDLER_H */