summaryrefslogtreecommitdiffstats
path: root/kontact/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/plugins')
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp6
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp8
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h2
-rw-r--r--kontact/plugins/karm/karm_plugin.cpp4
-rw-r--r--kontact/plugins/karm/karm_plugin.h2
-rw-r--r--kontact/plugins/kitchensync/Makefile.am14
-rw-r--r--kontact/plugins/kitchensync/kitchensync.desktop17
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp67
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.h51
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp4
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.h2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp6
-rw-r--r--kontact/plugins/kmail/kmail_plugin.h2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp6
-rw-r--r--kontact/plugins/kmail/summarywidget.h2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp4
-rw-r--r--kontact/plugins/knode/knode_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp44
-rw-r--r--kontact/plugins/knotes/knotes_part.h2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h4
-rw-r--r--kontact/plugins/knotes/knotes_plugin.cpp6
-rw-r--r--kontact/plugins/knotes/knotes_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp8
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp14
-rw-r--r--kontact/plugins/knotes/summarywidget.h2
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/journalplugin.h2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp14
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.h2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp16
-rw-r--r--kontact/plugins/korganizer/summarywidget.h2
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/todoplugin.h2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp18
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.h2
-rw-r--r--kontact/plugins/kpilot/kpilot_plugin.cpp2
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp10
-rw-r--r--kontact/plugins/kpilot/summarywidget.h2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp30
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h4
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp20
-rw-r--r--kontact/plugins/newsticker/summarywidget.h2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp18
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.h2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp28
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.h2
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/summary/dropwidget.h2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp4
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.h4
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp36
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp6
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h2
-rw-r--r--kontact/plugins/test/test_part.cpp6
-rw-r--r--kontact/plugins/test/test_part.h2
-rw-r--r--kontact/plugins/test/test_plugin.cpp4
-rw-r--r--kontact/plugins/test/test_plugin.h2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp10
-rw-r--r--kontact/plugins/weather/summarywidget.h2
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp2
65 files changed, 210 insertions, 359 deletions
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index a7a7fa7a..17cd5862 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator,
PluginFactory( "kontact_akregator" ) )
AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0)
+ : Kontact::Plugin( core, core, "akregator" ), m_stub(0)
{
setInstance( PluginFactory::instance() );
- insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
+ insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQ_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this );
@@ -89,7 +89,7 @@ MyBasePart* AkregatorPlugin::createPart()
{
MyBasePart* p = loadPart();
- connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart()));
+ connect(p, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart()));
m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator",
"AkregatorIface" );
m_stub->openStandardFeedList();
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 041d7a97..324d8ca8 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -50,7 +50,7 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
class AkregatorPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
AkregatorPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index d6db8112..8cdef758 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -52,20 +52,20 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin,
KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) )
KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ),
+ : Kontact::Plugin( core, core, "kaddressbook" ),
mStub( 0 )
{
setInstance( KAddressbookPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity",
- CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(),
+ CTRL+SHIFT+Key_C, this, TQ_SLOT( slotNewContact() ), actionCollection(),
"new_contact" ) );
insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
- TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
+ TQ_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload",
- 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncContacts() ), actionCollection(),
"kaddressbook_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<KABUniqueAppHandler>(), this );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index 3db624ce..6e073b19 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -44,7 +44,7 @@ public:
class KAddressbookPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index 8db54bc9..a84dd63b 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -37,12 +37,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm,
KarmPluginFactory( "kontact_karm" ) )
KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" )
+ : Kontact::Plugin( core, core, "KArm" )
{
setInstance( KarmPluginFactory::instance() );
(void)dcopClient();
insertNewAction( new TDEAction( i18n( "New Task" ), "karm",
- CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(),
+ CTRL+SHIFT+Key_W, this, TQ_SLOT( newTask() ), actionCollection(),
"new_task" ) );
}
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index f2f6259b..adf32b50 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -36,7 +36,7 @@ class TDEAboutData;
class KarmPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KarmPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kitchensync/Makefile.am b/kontact/plugins/kitchensync/Makefile.am
deleted file mode 100644
index c6df9113..00000000
--- a/kontact/plugins/kitchensync/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces $(all_includes)
-
-kde_module_LTLIBRARIES = libkontact_kitchensync.la
-libkontact_kitchensync_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_kitchensync_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la
-
-libkontact_kitchensync_la_SOURCES = kitchensync_plugin.cpp
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)/kontact
-service_DATA = kitchensync.desktop
-
-kitchensynciface_DIR = $(top_srcdir)/kitchensync
diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop
deleted file mode 100644
index 6a8153ed..00000000
--- a/kontact/plugins/kitchensync/kitchensync.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Service
-Icon=kitchensync
-X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
-
-X-TDE-Library=libkontact_kitchensync
-X-TDE-KontactPluginVersion=6
-X-TDE-KontactPartLibraryName=libkitchensyncpart
-
-X-TDE-PluginInfo-Name=kontact_kitchensync
-X-TDE-PluginInfo-Version=0.1
-X-TDE-PluginInfo-License=GPL
-X-TDE-PluginInfo-EnabledByDefault=false
-
-Name=Sync
-
-Comment=Synchronization Component (Kitchensynk Plugin)
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
deleted file mode 100644
index 48e33627..00000000
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- This file is part of Kontact.
-
- Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of TQt, and distribute the resulting executable,
- without including the source code for TQt in the source distribution.
-*/
-
-#include <tqwidget.h>
-
-#include <tdeaboutdata.h>
-#include <tdeaction.h>
-#include <tdeapplication.h>
-#include <kdebug.h>
-#include <kgenericfactory.h>
-#include <kiconloader.h>
-#include <tdemessagebox.h>
-#include <tdeparts/componentfactory.h>
-
-#include "core.h"
-#include "plugin.h"
-
-#include "kitchensync_plugin.h"
-
-typedef KGenericFactory< KitchenSyncPlugin, Kontact::Core > KitchenSyncPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libkontact_kitchensync,
- KitchenSyncPluginFactory( "kontact_kitchensync" ) )
-
-KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "KitchenSync" )
-{
- setInstance( KitchenSyncPluginFactory::instance() );
-}
-
-KitchenSyncPlugin::~KitchenSyncPlugin()
-{
-}
-
-KParts::ReadOnlyPart* KitchenSyncPlugin::createPart()
-{
- return loadPart();
-}
-
-TQStringList KitchenSyncPlugin::configModules() const
-{
- TQStringList modules;
- modules << "PIM/kitchensync.desktop";
- return modules;
-}
-
-#include "kitchensync_plugin.moc"
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
deleted file mode 100644
index b484e32e..00000000
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- This file is part of Kontact.
-
- Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of TQt, and distribute the resulting executable,
- without including the source code for TQt in the source distribution.
-*/
-
-#ifndef KITCHENSYNC_PLUGIN_H
-#define KITCHENSYNC_PLUGIN_H
-
-#include <tdelocale.h>
-#include <tdeparts/part.h>
-
-#include "plugin.h"
-
-class TDEAboutData;
-
-class KitchenSyncPlugin : public Kontact::Plugin
-{
- Q_OBJECT
-
- public:
- KitchenSyncPlugin( Kontact::Core *core, const char *name,
- const TQStringList & );
- virtual ~KitchenSyncPlugin();
-
- int weight() const { return 800; }
-
- virtual TQStringList configModules() const;
- protected:
- KParts::ReadOnlyPart *createPart();
-};
-
-#endif
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e2f9126f..690cbc50 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
{
initGUI();
- connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) );
- connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+ connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) );
+ connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
TDEAcceleratorManager::manage( this );
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 7cc4763e..e6681153 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -35,7 +35,7 @@ class TQCheckListItem;
class KCMKMailSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 09c2fd05..1a818694 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -56,17 +56,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin,
KMailPluginFactory( "kontact_kmailplugin" ) )
KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ),
+ : Kontact::Plugin( core, core, "kmail" ),
mStub( 0 )
{
setInstance( KMailPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new",
- CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(),
+ CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(),
"new_mail" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload",
- 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(),
"sync_mail" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 923fd3a8..ff8c532e 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -45,7 +45,7 @@ public:
class KMailPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 924938a0..31e22992 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
urlLabel->installEventFilter( this );
urlLabel->setAlignment( AlignLeft );
urlLabel->show();
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- TQT_SLOT( selectFolder( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ TQ_SLOT( selectFolder( const TQString& ) ) );
mLayout->addWidget( urlLabel, counter, 0 );
mLabels.append( urlLabel );
@@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index 3813ee03..d5fb299c 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -40,7 +40,7 @@ class TQString;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 758572bb..8a6fb54f 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -45,12 +45,12 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin,
KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0)
+ : Kontact::Plugin( core, core, "knode" ), mStub(0)
{
setInstance( KNodePluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A,
- this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
+ this, TQ_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
new Kontact::UniqueAppHandlerFactory<KNodeUniqueAppHandler>(), this );
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 4b1cb21e..c74878c9 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -42,7 +42,7 @@ public:
class KNodePlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 20e8d6c9..7ec3df6c 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
setInstance( new TDEInstance( "knotes" ) );
// create the actions
- new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+ new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ),
actionCollection(), "file_new" );
- new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+ new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ),
actionCollection(), "edit_rename" );
- new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+ new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ),
actionCollection(), "edit_delete" );
- new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+ new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ),
actionCollection(), "print_note" );
// TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
mNotesView->setAutoArrange( true );
mNotesView->setSorting( true );
- connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ),
- this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ),
- this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
- connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ),
- this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) );
- connect( mNotesView, TQT_SIGNAL( onViewport() ),
- this, TQT_SLOT( slotOnViewport() ) );
- connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ),
- this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ),
+ this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ),
+ this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
+ connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ),
+ this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) );
+ connect( mNotesView, TQ_SIGNAL( onViewport() ),
+ this, TQ_SLOT( slotOnViewport() ) );
+ connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ),
+ this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
slotOnCurrentChanged( 0 );
@@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
setXMLFile( "knotes_part.rc" );
// connect the resource manager
- connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( createNote( KCal::Journal* ) ) );
- connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( killNote( KCal::Journal* ) ) );
+ connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( createNote( KCal::Journal* ) ) );
+ connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( killNote( KCal::Journal* ) ) );
// read the notes
mManager->load();
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index 67808bae..62766b1f 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -46,7 +46,7 @@ class Journal;
class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 9a30d715..735f492e 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -114,7 +114,7 @@ class KNotesIconView : public TDEIconView
class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
mNoteEdit->setFocus();
KXMLGUIBuilder builder( page );
- KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
+ KXMLGUIFactory factory( &builder, this );
factory.addClient( this );
mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index bec6fb5c..1b66eea1 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin,
KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ),
+ : Kontact::Plugin( core, core, "knotes" ),
mAboutData( 0 )
{
setInstance( KNotesPluginFactory::instance() );
insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
- this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
+ this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
- this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
+ this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
}
KNotesPlugin::~KNotesPlugin()
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index 069f10fb..1bde9e63 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -31,7 +31,7 @@ class SummaryWidget;
class KNotesPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 97bd771f..dfa469bc 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
mNoteIVI = item;
if ( !mNoteIVI ) {
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if ( isVisible() ) {
setFilter( false );
hide();
@@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
hide();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
setFilter( true );
startTimer( 600 ); // delay showing the tooltip for 0.7 sec
}
@@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev )
void KNoteTip::timerEvent( TQTimerEvent * )
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if ( !isVisible() ) {
startTimer( 15000 ); // show the tooltip for 15 sec
@@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e )
case TQEvent::FocusIn:
case TQEvent::FocusOut:
case TQEvent::Wheel:
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
setFilter( false );
hide();
default:
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index ca0f6ae5..89ae1ec1 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
KNotesResourceManager *manager = new KNotesResourceManager();
- TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( addNote( KCal::Journal* ) ) );
- TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
- this, TQT_SLOT( removeNote( KCal::Journal* ) ) );
+ TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( addNote( KCal::Journal* ) ) );
+ TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+ this, TQ_SLOT( removeNote( KCal::Journal* ) ) );
manager->load();
@@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView()
TQToolTip::add( urlLabel, (*it)->description().left( 80 ) );
}
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( urlClicked( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( urlClicked( const TQString& ) ) );
counter++;
}
@@ -138,7 +138,7 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index 305873d7..1ac015f4 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -42,7 +42,7 @@ namespace Kontact {
class KNotesSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index ac3b7735..a028d937 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -43,17 +43,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin,
JournalPluginFactory( "kontact_journalplugin" ) )
JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( JournalPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal",
- CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
+ CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(),
"new_journal" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload",
- 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(),
"journal_sync" ) );
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index f7d0a465..25106164 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -33,7 +33,7 @@
class JournalPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index b8c7a0cd..4c0945e7 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -54,11 +54,11 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
customDaysChanged( 1 );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
- connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+ connect( mTodoGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
TDEAcceleratorManager::manage( this );
@@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI()
{
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this );
+ mCalendarGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Appointments" ), this );
TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
KDialog::spacingHint() );
@@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI()
layout->addWidget( mCalendarGroup );
- mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this );
+ mTodoGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "To-dos" ), this );
new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 18db1df7..ce451f4e 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -31,7 +31,7 @@ class TQButtonGroup;
class KCMKOrgSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index b25016aa..475c64a9 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin,
KOrganizerPluginFactory( "kontact_korganizerplugin" ) )
KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
@@ -65,11 +65,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment",
- CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(),
+ CTRL+SHIFT+Key_E, this, TQ_SLOT( slotNewEvent() ), actionCollection(),
"new_event" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload",
- 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncEvents() ), actionCollection(),
"korganizer_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 3aaa4083..d955b3dc 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -35,7 +35,7 @@
class KOrganizerPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 93b2c2dd..6a3c0432 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -66,9 +66,9 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( updateView() ) );
updateView();
}
@@ -202,10 +202,10 @@ void SummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( viewEvent( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( viewEvent( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) );
if ( !tipText.isEmpty() ) {
@@ -286,7 +286,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 02fc11c4..d0c9353e 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -38,7 +38,7 @@ class KOrganizerPlugin;
class SummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 885c835a..bcb2c566 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -55,18 +55,18 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin,
TodoPluginFactory( "kontact_todoplugin" ) )
TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( TodoPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo",
- CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
+ CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(),
"new_todo" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload",
- 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(),
"todo_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 4d62a72d..767d0de3 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -33,7 +33,7 @@
class TodoPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 255ee2ef..bdab72a9 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -68,9 +68,9 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( updateView() ) );
updateView();
}
@@ -163,10 +163,10 @@ void TodoSummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( viewTodo( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( viewTodo( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
if ( !tipText.isEmpty() ) {
@@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid )
void TodoSummaryWidget::completeTodo( const TQString &uid )
{
KCal::Todo *todo = mCalendar->todo( uid );
- IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) );
+ IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
KCal::Todo *oldTodo = todo->clone();
todo->setCompleted( TQDateTime::currentDateTime() );
@@ -251,7 +251,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index 292444cd..6aa1bc4d 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -38,7 +38,7 @@ class TodoPlugin;
class TodoSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 81053917..9239db85 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin,
KPilotPluginFactory( "kontact_kpilotplugin" ) )
KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 )
+ : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 )
{
setInstance( KPilotPluginFactory::instance() );
// TODO: Make sure kpilotDaemon is running!
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 9ab256d2..cc91632f 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -71,8 +71,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout->addWidget( mSyncTimeLabel, row, 1 );
mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this );
mLayout->addWidget( mShowSyncLogLabel, row, 3 );
- connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( showSyncLog( const TQString& ) ) );
+ connect( mShowSyncLogLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( showSyncLog( const TQString& ) ) );
// User
row++;
@@ -110,8 +110,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 );
mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this );
mLayout->addWidget( mNoConnectionStartLabel, row, 3 );
- connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( startKPilot() ) );
+ connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( startKPilot() ) );
if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
startKPilot();
@@ -119,7 +119,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)",
"receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
}
SummaryWidget::~SummaryWidget()
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 209934fd..086fbd64 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -44,7 +44,7 @@ class KURLLabel;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 179baed3..4a698ff8 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
mTitle->setText( title );
mURL->setText( url );
mTitle->setFocus();
- connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
+ connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
modified();
}
@@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
{
initGUI();
- connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ),
- this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) );
- connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) );
+ connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) );
+ connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) );
- connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
+ connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) );
- connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) );
+ connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) );
TDEAcceleratorManager::manage( this );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
mSelectedNews->setFullWidth( true );
layout->addWidget( mSelectedNews, 0, 2 );
- TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+ TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
i18n( "News Feed Settings" ), this );
TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a44cae7f..9227cb54 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -37,7 +37,7 @@ class NewsItem;
class KCMKontactKNT : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -85,7 +85,7 @@ class KCMKontactKNT : public TDECModule
class NewsEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 04d46883..62d27fc8 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin,
NewsTickerPluginFactory( "kontact_newstickerplugin" ) )
NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name )
+ : Kontact::Plugin( core, core, name )
{
setInstance( NewsTickerPluginFactory::instance() );
}
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index f385b269..b7b3f866 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mBaseWidget = new TQWidget( this, "baseWidget" );
vlay->addWidget( mBaseWidget );
- connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) );
readConfig();
@@ -223,10 +223,10 @@ void SummaryWidget::updateView()
urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
// header
TQLabel *label = new TQLabel( hbox );
@@ -252,10 +252,10 @@ void SummaryWidget::updateView()
mLabels.append( urlLabel );
mLayout->addWidget( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
numArticles++;
@@ -306,7 +306,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( label->url() );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index c5122fb8..2363dcc4 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -55,7 +55,7 @@ typedef TQValueList<Feed> FeedList;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index b2d1a45d..f35cc2b4 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -56,12 +56,12 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
customDaysChanged( 1 );
- connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
- connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+ connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+ connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mContactGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
TDEAcceleratorManager::manage( this );
@@ -87,7 +87,7 @@ void KCMSDSummary::initGUI()
{
TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
- mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this );
+ mDaysGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Special Dates Summary" ), this );
TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(),
KDialog::spacingHint() );
@@ -119,7 +119,7 @@ void KCMSDSummary::initGUI()
layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
- mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this );
+ mCalendarGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Calendar" ), this );
mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup );
mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup );
@@ -127,7 +127,7 @@ void KCMSDSummary::initGUI()
mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup );
- mContactGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Contact List" ), this );
+ mContactGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Contact List" ), this );
mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index c0095dfa..e3189656 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -35,7 +35,7 @@ class TDEAboutData;
class KCMSDSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 376389f9..fb9167c6 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -95,10 +95,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
// Setup the Addressbook
TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true );
- connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
- this, TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- this, TQT_SLOT( updateView() ) );
+ connect( ab, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+ this, TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ this, TQ_SLOT( updateView() ) );
// Setup the Calendar
mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() );
@@ -128,10 +128,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
}
mCalendar = KOrg::StdCalendar::self();
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
- this, TQT_SLOT( updateView() ) );
- connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
- this, TQT_SLOT( updateView() ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ),
+ this, TQ_SLOT( updateView() ) );
+ connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ this, TQ_SLOT( updateView() ) );
// Update Configuration
configUpdated();
@@ -250,7 +250,7 @@ void SDSummaryWidget::updateView()
TQString anniversaryAsString =
(*it).custom( "KADDRESSBOOK" , "X-Anniversary" );
if ( !anniversaryAsString.isEmpty() ) {
- TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate );
+ TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate );
if ( anniversary.isValid() && mShowAnniversariesFromKAB ) {
SDEntry entry;
entry.type = IncidenceTypeContact;
@@ -506,10 +506,10 @@ void SDSummaryWidget::updateView()
mLayout->addWidget( urlLabel, counter, 4 );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( mailContact( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( popupMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( mailContact( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( popupMenu( const TQString& ) ) );
} else {
label = new TQLabel( this );
label->setText( (*addrIt).summary );
@@ -593,7 +593,7 @@ void SDSummaryWidget::popupMenu( const TQString &uid )
bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index ff9fb70a..2c63b259 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -42,7 +42,7 @@ class TQLabel;
class SDSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 58c830c8..a1893aef 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin,
SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) )
SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name ),
+ : Kontact::Plugin( core, core, name ),
mAboutData( 0 )
{
setInstance( SpecialdatesPluginFactory::instance() );
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index d406f441..fe92825a 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -26,7 +26,7 @@
class DropWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 65bd13e5..591cb033 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
layout->setStretchFactor( mPluginView, 1 );
- connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
+ connect( mPluginView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ this, TQ_SLOT( itemClicked( TQListViewItem* ) ) );
load();
TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ),
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 3f1cdd69..bfc72d40 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -32,7 +32,7 @@ class KPluginInfo;
class PluginView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -42,7 +42,7 @@ class PluginView : public TDEListView
class KCMKontactSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 94474c55..5c64d934 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
initGUI( core );
- connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
+ connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
slotAdjustPalette();
setDate( TQDate::currentDate() );
- connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
- TQT_SLOT( setDate( const TQDate& ) ) );
+ connect( mCore, TQ_SIGNAL( dayChanged( const TQDate& ) ),
+ TQ_SLOT( setDate( const TQDate& ) ) );
KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" );
- connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
- info, TQT_SIGNAL( textChanged( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+ info, TQ_SIGNAL( textChanged( const TQString& ) ) );
mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ),
"configure", 0, this,
- TQT_SLOT( slotConfigure() ), actionCollection(),
+ TQ_SLOT( slotConfigure() ), actionCollection(),
"summaryview_configure" );
setXMLFile( "kontactsummary_part.rc" );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotTextChanged() ) );
}
SummaryViewPart::~SummaryViewPart()
@@ -142,8 +142,8 @@ void SummaryViewPart::updateWidgets()
mSummaries.clear();
mFrame = new DropWidget( mMainWidget );
- connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
mMainLayout->insertWidget( 2, mFrame );
@@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets()
if ( summary->summaryHeight() > 0 ) {
mSummaries.insert( plugin->identifier(), summary );
- connect( summary, TQT_SIGNAL( message( const TQString& ) ),
- BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
- connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( summary, TQ_SIGNAL( message( const TQString& ) ),
+ BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) );
+ connect( summary, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
!mRightColumnSummaries.contains( plugin->identifier() ) ) {
@@ -327,8 +327,8 @@ void SummaryViewPart::slotConfigure()
TQStringList modules = configModules();
modules.prepend( "kcmkontactsummary.desktop" );
- connect( &dlg, TQT_SIGNAL( configCommitted() ),
- this, TQT_SLOT( updateWidgets() ) );
+ connect( &dlg, TQ_SIGNAL( configCommitted() ),
+ this, TQ_SLOT( updateWidgets() ) );
TQStringList::ConstIterator strIt;
for ( strIt = modules.begin(); strIt != modules.end(); ++strIt )
@@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
mMainWidget = new TQFrame( sv->viewport() );
sv->addChild( mMainWidget );
mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- sv->setFocusPolicy( TQ_StrongFocus );
+ sv->setFocusPolicy( TQWidget::StrongFocus );
setWidget( sv );
mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(),
@@ -384,8 +384,8 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
mFrame = new DropWidget( mMainWidget );
mMainLayout->insertWidget( 2, mFrame );
- connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
- this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+ connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+ this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
updateWidgets();
}
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 4b6b3126..c7c55e14 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -51,7 +51,7 @@ class KCMultiDialog;
class SummaryViewPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 81e46a8e..711c2b39 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin,
SummaryViewFactory( "kontact_summaryplugin" ) )
SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name),
+ : Kontact::Plugin( core, core, name),
mAboutData( 0 ), mPart( 0 )
{
setInstance( SummaryViewFactory::instance() );
@@ -42,8 +42,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0,
0, actionCollection(),
"kontact_summary_sync" );
- connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
- connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) );
+ connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) );
+ connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) );
insertSyncAction( mSyncAction );
fillSyncActionSubEntries();
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 5ea25786..cef65f5d 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -34,7 +34,7 @@ class SummaryViewPart;
class SummaryView : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 2e712ae8..12a7b483 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -48,14 +48,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
m_edit = new TQTextEdit;
setWidget(m_edit);
setXMLFile("testpartui.rc");
- new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
+ new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
m_kab_stub = 0L;
new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
}
TestPart::~TestPart()
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index af7da8f8..10f9ced9 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -33,7 +33,7 @@ class KAddressBookIface_stub;
class TestPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 631d91cb..e98cd4f2 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -35,11 +35,11 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) )
TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &)
- : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name)
+ : Kontact::Plugin(_core, _core, name)
{
setInstance(TestPluginFactory::instance());
- insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
+ insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
setXMLFile("kptestplugin.rc");
}
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 2a541c84..ad9f081d 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.h
@@ -33,7 +33,7 @@ class TestPart;
class TestPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 37fbe74d..323ad8de 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
if ( reply.isValid() ) {
mStations = reply;
- connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) );
mTimer.start( 0 );
} else {
kdDebug(5602) << "ERROR: dcop reply not valid..." << endl;
@@ -117,8 +117,8 @@ void SummaryWidget::updateView()
urlLabel->setAlignment( AlignTop );
layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
mLabels.append( urlLabel );
- connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- this, TQT_SLOT( showReport( const TQString& ) ) );
+ connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ this, TQ_SLOT( showReport( const TQString& ) ) );
TQLabel* label = new TQLabel( this );
label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
@@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool )
void SummaryWidget::showReport( const TQString &stationID )
{
mProc = new TDEProcess;
- TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ),
- this, TQT_SLOT( reportFinished( TDEProcess* ) ) );
+ TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ),
+ this, TQ_SLOT( reportFinished( TDEProcess* ) ) );
*mProc << "kweatherreport";
*mProc << stationID;
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 96361526..196269fd 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -86,7 +86,7 @@ class WeatherData
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
public:
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index 93a97bfc..506b16fd 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin,
WeatherPluginFactory( "kontact_weatherplugin" ) )
WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 )
+ : Kontact::Plugin( core, core, name ), mAboutData( 0 )
{
setInstance( WeatherPluginFactory::instance() );
}