diff options
Diffstat (limited to 'kontact/plugins/specialdates')
| -rw-r--r-- | kontact/plugins/specialdates/kcmsdsummary.cpp | 22 | ||||
| -rw-r--r-- | kontact/plugins/specialdates/kcmsdsummary.h | 2 | ||||
| -rw-r--r-- | kontact/plugins/specialdates/sdsummarywidget.cpp | 32 | ||||
| -rw-r--r-- | kontact/plugins/specialdates/sdsummarywidget.h | 2 | ||||
| -rw-r--r-- | kontact/plugins/specialdates/specialdates_plugin.cpp | 2 | 
5 files changed, 30 insertions, 30 deletions
| diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index b2d1a45d..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 ); @@ -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..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(); @@ -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 ); @@ -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/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() ); | 
