diff options
Diffstat (limited to 'kontact')
49 files changed, 333 insertions, 333 deletions
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction index d51fd886..7eb4e412 100644 --- a/kontact/DESIGN.dcopinteraction +++ b/kontact/DESIGN.dcopinteraction @@ -20,12 +20,12 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo * Constructor: m_foo_stub = 0L; - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString&)), - this, SLOT( unregisteredFromDCOP( const QCString& )) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) ); * Destructor: - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete m_foo_stub; [Note that setNotifications() is implemented with a refcount, this is the @@ -74,7 +74,7 @@ See e.g. tdepim/kaddressbook/kaddressbook.desktop Designing DCOP interfaces ========================= -Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes. +Porting the kroupware signals/slots to DCOP requires some changes. For instance any non-const reference (such as those used for returning values to the caller) has to be changed. If there is more than one value to be returned, you need to diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 5cc30c2c..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 ); - TQObject::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 7317febc..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,7 +38,7 @@ 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 { TQ_OBJECT 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 af7cbfa7..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,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 TQObject, virtual public KXMLGUIClient +class TDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient { TQ_OBJECT diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index 945395c8..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,7 +33,7 @@ namespace Kontact /** Summary widget for display in the Summary View plugin. */ -class KDE_EXPORT Summary : public TQWidget +class TDE_EXPORT Summary : public TQWidget { TQ_OBJECT 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 bef34d47..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,7 +91,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor * Kontact takes over from there. * */ -class KDE_EXPORT UniqueAppWatcher : public TQObject +class TDE_EXPORT UniqueAppWatcher : public TQObject { TQ_OBJECT 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/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/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/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index e2f9126f..7b2d92b2 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -37,11 +37,11 @@ #include "kcmkmailsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * ) { return new KCMKMailSummary( parent, "kcmkmailsummary" ); } @@ -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/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 09c2fd05..8d9c670a 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -29,7 +29,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tdeparts/componentfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdetempfile.h> @@ -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( @@ -203,7 +203,7 @@ int KMailUniqueAppHandler::newInstance() } bool KMailPlugin::queryClose() const { - KMailIface_stub stub( kapp->dcopClient(), "kmail", "KMailIface" ); + KMailIface_stub stub( tdeApp->dcopClient(), "kmail", "KMailIface" ); bool canClose=stub.canQueryClose(); return canClose; } 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/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/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_p.h b/kontact/plugins/knotes/knotes_part_p.h index 0d6cd46c..735f492e 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -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/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 97bd771f..fe39868a 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: @@ -184,11 +184,11 @@ void KNoteTip::setFilter( bool enable ) return; if ( enable ) { - kapp->installEventFilter( this ); + tdeApp->installEventFilter( this ); TQApplication::setGlobalMouseTracking( true ); } else { TQApplication::setGlobalMouseTracking( false ); - kapp->removeEventFilter( this ); + tdeApp->removeEventFilter( this ); } mFilter = enable; diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index ca0f6ae5..d7269fac 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -34,7 +34,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kurllabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotes/resourcenotes.h> #include <knotes/resourcemanager.h> @@ -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/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/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index eda11019..41efc83e 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -37,11 +37,11 @@ #include "kcmkorgsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * ) { return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } @@ -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 ); diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp index c8360583..69ab8dc2 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.cpp +++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp @@ -41,10 +41,10 @@ int KOrganizerUniqueAppHandler::newInstance() korganizer.send( "handleCommandLine" ); // Bring korganizer's plugin to front - // 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(); } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index b25016aa..69cdd757 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -35,7 +35,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <dcopclient.h> @@ -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( @@ -238,7 +238,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) } bool KOrganizerPlugin::queryClose() const { - KOrganizerIface_stub stub( kapp->dcopClient(), "korganizer", "KOrganizerIface" ); + KOrganizerIface_stub stub( tdeApp->dcopClient(), "korganizer", "KOrganizerIface" ); bool canClose=stub.canQueryClose(); return (!canClose); } diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 93b2c2dd..8400b83e 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> #include <libkcal/resourcecalendar.h> @@ -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/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/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 255ee2ef..2fb9bf95 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/resourcecalendar.h> #include <libkcal/resourcelocal.h> @@ -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/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..6a15dc09 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,16 +110,16 @@ 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" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) { startKPilot(); } 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( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) ); } SummaryWidget::~SummaryWidget() diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 2eee85ea..84aaca95 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -45,11 +45,11 @@ #include "newsfeeds.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * ) { return new KCMKontactKNT( parent, "kcmkontactknt" ); } @@ -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 ); @@ -392,7 +392,7 @@ bool KCMKontactKNT::dcopActive() const TQString error; TQCString appID; bool isGood = true; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if ( !client->isApplicationRegistered( "rssservice" ) ) { if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) isGood = false; 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..e209d031 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) TQCString appID; bool dcopAvailable = true; - if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "rssservice" ) ) { if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this ); vlay->addWidget( label, TQt::AlignHCenter ); @@ -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& ) ), + tdeApp, 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& ) ), + tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( rmbMenu( const TQString& ) ) ); numArticles++; @@ -300,13 +300,13 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->clipboard()->setText( url, TQClipboard::Clipboard ); + tdeApp->clipboard()->setText( url, TQClipboard::Clipboard ); } 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/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index c0512fae..3a97d2c1 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -39,11 +39,11 @@ #include "kcmsdsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * ) { return new KCMSDSummary( parent, "kcmsdsummary" ); } @@ -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 ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index e4f86278..083392ef 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -39,7 +39,7 @@ #include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> #include <libkcal/resourcecalendar.h> @@ -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(); @@ -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 ); @@ -558,7 +558,7 @@ void SDSummaryWidget::mailContact( const TQString &uid ) TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); TQString email = ab->findByUid( uid ).fullEmail(); - kapp->invokeMailer( email, TQString() ); + tdeApp->invokeMailer( email, TQString() ); } void SDSummaryWidget::viewContact( const TQString &uid ) @@ -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/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/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 65bd13e5..0ceb1ec4 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -39,11 +39,11 @@ #include "kcmkontactsummary.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) { return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } @@ -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/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index ddb43d71..fec7f36c 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -37,7 +37,7 @@ #include <tdemessagebox.h> #include <kservice.h> #include <ktrader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqscrollview.h> #include <tdeglobal.h> #include <tdelocale.h> @@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, initGUI( core ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); + connect( tdeApp, 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() ) ) { @@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); + mMainWidget->setPaletteBackgroundColor( tdeApp->palette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) @@ -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 ) @@ -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_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/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 2e712ae8..0752a836 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -48,19 +48,19 @@ 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& )) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) ); } TestPart::~TestPart() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete m_kab_stub; } @@ -92,7 +92,7 @@ bool TestPart::connectToAddressBook() } // TODO document the required named for the dcop interfaces e.g. "CalendarIface". TQCString dcopObjectId = "KAddressBookIface"; - m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId); + m_kab_stub = new KAddressBookIface_stub(tdeApp->dcopClient(), dcopService, dcopObjectId); } return m_kab_stub != 0L; } 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/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 37fbe74d..fb28ab33 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -33,7 +33,7 @@ #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurllabel.h> #include "summarywidget.h" @@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) TQString error; TQCString appID; bool serviceAvailable = true; - if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter ); @@ -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/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() ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index e3560ed7..f9a261a9 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -267,16 +267,16 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) setFocusPolicy( TQWidget::NoFocus ); - connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), - TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); + connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), + TQ_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) ); - mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); + mMapper = new TQSignalMapper( this ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( shortCutSelected( int ) ) ); TQToolTip::remove( this ); if ( !mShowText ) @@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item ) setPaintActiveItem( mHighlightItem, true ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotStopHighlight() ) ); } void Navigator::slotStopHighlight() @@ -539,8 +539,8 @@ IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); - connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), - TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); + connect( mNavigator, TQ_SIGNAL( pluginActivated( Kontact::Plugin* ) ), + TQ_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); setAcceptDrops( true ); } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 4e6e4407..0d2426a0 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -38,11 +38,11 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { + TDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) { return new KcmKontact( parent, "kcmkontact" ); } } @@ -81,8 +81,8 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name ) pluginStartupLayout->addWidget( selection->comboBox() ); selection->comboBox()->setEnabled( false ); - connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ), - selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( forceStartupPlugin->checkBox(), TQ_SIGNAL( toggled( bool ) ), + selection->comboBox(), TQ_SLOT( setEnabled( bool ) ) ); load(); } @@ -104,7 +104,7 @@ PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget { mItem = item; mPluginCombo = new TQComboBox( parent ); - connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mPluginCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } PluginSelection::~PluginSelection() diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 576eb48c..1602a300 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -28,9 +28,9 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdestartupinfo.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktrader.h> #include "plugin.h" @@ -49,7 +49,7 @@ static const char description[] = static const char version[] = "1.2.9"; -class KontactApp : public KUniqueApplication { +class KontactApp : public TDEUniqueApplication { public: KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) { @@ -139,7 +139,7 @@ int KontactApp::newInstance() // Handle startup notification and window activation // (The first time it will do nothing except note that it was called) - return KUniqueApplication::newInstance(); + return TDEUniqueApplication::newInstance(); } int main( int argc, char **argv ) diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 43d7ca54..27af94f5 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -52,7 +52,7 @@ #include <ksettings/dialog.h> #include <ksettings/dispatcher.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <ktip.h> @@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog void fixButtonLabel( TQWidget *widget ) { TQObject *object = widget->child( "KJanusWidget::buttonBelowList" ); - TQPushButton *button = static_cast<TQPushButton*>( TQT_TQWIDGET(object) ); + TQPushButton *button = static_cast<TQPushButton*>( object ); if ( button ) button->setText( i18n( "Select Components ..." ) ); } @@ -120,8 +120,8 @@ void MainWindow::initGUI() setupActions(); setHelpMenuEnabled( false ); KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() ); - connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), - TQT_SLOT( showAboutDialog() ) ); + connect( helpMenu, TQ_SIGNAL( showAboutApplication() ), + TQ_SLOT( showAboutDialog() ) ); TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), @@ -133,7 +133,7 @@ void MainWindow::initGUI() (*it)->load(); TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), + this, TQ_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); @@ -144,8 +144,8 @@ void MainWindow::initGUI() } } - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); setStandardToolBarMenuEnabled( true ); @@ -157,10 +157,10 @@ void MainWindow::initGUI() resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane setAutoSaveSettings(); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( slotLoadProfile( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), - this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( slotLoadProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( saveToProfileRequested( const TQString& ) ), + this, TQ_SLOT( slotSaveToProfile( const TQString& ) ) ); } @@ -168,15 +168,15 @@ void MainWindow::initObject() { // prepare the part manager mPartManager = new KParts::PartManager( this ); - connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( mPartManager, TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); if ( mSidePane ) { mSidePane->updatePlugins(); } - KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), - TQT_SLOT( updateConfig() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, + TQ_SLOT( updateConfig() ) ); loadSettings(); @@ -187,18 +187,18 @@ void MainWindow::initObject() // done initializing slotShowStatusMsg( TQString() ); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( slotShowStatusMsg( const TQString& ) ) ); // launch commandline specified module if any activatePluginModule(); - if ( Prefs::lastVersionSeen() == kapp->aboutData()->version() ) { + if ( Prefs::lastVersionSeen() == tdeApp->aboutData()->version() ) { selectPlugin( mCurrentPlugin ); } paintAboutScreen( introductionString() ); - Prefs::setLastVersionSeen( kapp->aboutData()->version() ); + Prefs::setLastVersionSeen( tdeApp->aboutData()->version() ); } MainWindow::~MainWindow() @@ -251,8 +251,8 @@ void MainWindow::initWidgets() sizes << 0; mSplitter->setSizes(sizes); - connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ), - TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) ); + connect( mSidePane, TQ_SIGNAL( pluginSelected( Kontact::Plugin * ) ), + TQ_SLOT( selectPlugin( Kontact::Plugin * ) ) ); TQVBox *vBox; if ( mSplitter ) { @@ -291,7 +291,7 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -323,19 +323,19 @@ void MainWindow::initAboutScreen() mIntroPart->view()->setLineWidth( 0 ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); } void MainWindow::setupActions() { - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); TDEConfig* const cfg = Prefs::self()->config(); @@ -344,18 +344,18 @@ void MainWindow::setupActions() if ( mSyncActionsEnabled ) { mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ), - TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), + new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQ_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), + new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQ_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), + new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQ_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), + new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); @@ -543,7 +543,7 @@ void MainWindow::loadPlugins() kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl; Kontact::Plugin *plugin = KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>( - (*it)->service(), TQT_TQOBJECT(this) ); + (*it)->service(), this ); if ( !plugin ) continue; @@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked() TDEToolBar* Kontact::MainWindow::findToolBar(const char* name) { // like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found - return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar"))); + return static_cast<TDEToolBar *>(child(name, "TDEToolBar")); } void MainWindow::slotActionTriggered() @@ -802,7 +802,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } // store old focus widget - TQWidget *focusWidget = kapp->focusWidget(); + TQWidget *focusWidget = tdeApp->focusWidget(); if ( mCurrentPlugin && focusWidget ) { // save the focus widget only when it belongs to the activated part TQWidget *parent = focusWidget->parentWidget(); @@ -977,8 +977,8 @@ void MainWindow::slotPreferences() } dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this ); dlg->addPluginInfos( filteredPlugins ); - connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ), - TQT_SLOT( pluginsChanged() ) ); + connect( dlg, TQ_SIGNAL( pluginSelectionChanged() ), + TQ_SLOT( pluginsChanged() ) ); } dlg->show(); @@ -1053,8 +1053,8 @@ void MainWindow::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( slotNewToolbarConfig() ) ); edit.exec(); } @@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url ) if ( !url.query().isEmpty() ) { app = url.query().mid( 1 ); } - kapp->invokeHelp( TQString(), app ); + tdeApp->invokeHelp( TQString(), app ); } } else { new KRun( url, this ); @@ -1133,8 +1133,8 @@ void MainWindow::saveProperties( TDEConfig *config ) bool MainWindow::queryClose() { - //if ( kapp->sessionSaving() || mReallyClose ) - if ( kapp->sessionSaving() ) + //if ( tdeApp->sessionSaving() || mReallyClose ) + if ( tdeApp->sessionSaving() ) return true; bool localClose = true; @@ -1178,7 +1178,7 @@ TQString MainWindow::introductionString() "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>" "</table>" "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) - .arg( kapp->aboutData()->version() ) + .arg( tdeApp->aboutData()->version() ) .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) .arg( "exec:/help?kontact" ) .arg( iconSize ) diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc index 03eb7af7..3b94b5b7 100644 --- a/kontact/src/prefs.kcfgc +++ b/kontact/src/prefs.kcfgc @@ -6,7 +6,7 @@ Singleton=true Mutators=true #Inherits=KPimPrefs #IncludeFiles=libtdepim/kpimprefs.h -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT MemberVariables=public GlobalEnums=true ItemAccessors=true diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index e85d90c5..0c9c2a49 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -53,10 +53,10 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_list->setRenameable( NameColumn, true ); m_list->setRenameable( DescriptionColumn, true ); - connect( m_list, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( listSelectionChanged() ) ); - connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( m_list, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( listSelectionChanged() ) ); + connect( m_list, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); horizontalLayout->addWidget( m_list ); TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout ); @@ -64,49 +64,49 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_newProfileButton = new TQPushButton( mainWidget ); m_newProfileButton->setText( i18n("New Profile") ); - connect( m_newProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewProfile() ) ); + connect( m_newProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewProfile() ) ); buttonLayout->addWidget( m_newProfileButton ); m_deleteProfileButton = new TQPushButton( mainWidget ); m_deleteProfileButton->setText( i18n("Delete Profile") ); m_deleteProfileButton->setEnabled( false ); - connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteSelectedProfile() ) ); + connect( m_deleteProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteSelectedProfile() ) ); buttonLayout->addWidget( m_deleteProfileButton ); m_saveProfileButton = new TQPushButton( mainWidget ); m_saveProfileButton->setText( i18n("Save Profile") ); m_saveProfileButton->setEnabled( false ); - connect( m_saveProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( saveToSelectedProfile() ) ); + connect( m_saveProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( saveToSelectedProfile() ) ); buttonLayout->addWidget( m_saveProfileButton ); buttonLayout->addStretch(); m_importProfileButton = new TQPushButton( mainWidget ); m_importProfileButton->setText( i18n("Import Profile") ); - connect( m_importProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importProfile() ) ); + connect( m_importProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importProfile() ) ); buttonLayout->addWidget( m_importProfileButton ); m_exportProfileButton = new TQPushButton( mainWidget ); m_exportProfileButton->setText( i18n("Export Profile") ); m_exportProfileButton->setEnabled( false ); - connect( m_exportProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( exportSelectedProfile() ) ); + connect( m_exportProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( exportSelectedProfile() ) ); buttonLayout->addWidget( m_exportProfileButton ); setMainWidget( mainWidget ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ), - this, TQT_SLOT( profileAdded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ), - this, TQT_SLOT( profileRemoved( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( profileLoaded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ), - this, TQT_SLOT( profileUpdated( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileAdded( const TQString& ) ), + this, TQ_SLOT( profileAdded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileRemoved( const TQString& ) ), + this, TQ_SLOT( profileRemoved( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( profileLoaded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileUpdated( const TQString& ) ), + this, TQ_SLOT( profileUpdated( const TQString& ) ) ); const TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles(); for ( TQValueList<Kontact::Profile>::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 0d87b9bf..80941e02 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> |