summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/plugins/korganizer')
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/journalplugin.h2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp18
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.h2
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.cpp8
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp10
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp18
-rw-r--r--kontact/plugins/korganizer/summarywidget.h2
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/todoplugin.h2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp20
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.h2
13 files changed, 49 insertions, 49 deletions
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index ac3b7735..a028d937 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -43,17 +43,17 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin,
JournalPluginFactory( "kontact_journalplugin" ) )
JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( JournalPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal",
- CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
+ CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(),
"new_journal" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload",
- 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(),
"journal_sync" ) );
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index f7d0a465..25106164 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -33,7 +33,7 @@
class JournalPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index b8c7a0cd..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 );
@@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI()
{
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
- mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this );
+ mCalendarGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Appointments" ), this );
TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
KDialog::spacingHint() );
@@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI()
layout->addWidget( mCalendarGroup );
- mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this );
+ mTodoGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "To-dos" ), this );
new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 18db1df7..ce451f4e 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -31,7 +31,7 @@ class TQButtonGroup;
class KCMKOrgSummary : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/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/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 3aaa4083..d955b3dc 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -35,7 +35,7 @@
class KOrganizerPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 93b2c2dd..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/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 02fc11c4..d0c9353e 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -38,7 +38,7 @@ class KOrganizerPlugin;
class SummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 885c835a..bcb2c566 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -55,18 +55,18 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin,
TodoPluginFactory( "kontact_todoplugin" ) )
TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
+ : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 )
{
setInstance( TodoPluginFactory::instance() );
instance()->iconLoader()->addAppDir("tdepim");
insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo",
- CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
+ CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(),
"new_todo" ) );
insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload",
- 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(),
+ 0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(),
"todo_sync" ) );
mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 4d62a72d..767d0de3 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -33,7 +33,7 @@
class TodoPlugin : public Kontact::Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 255ee2ef..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/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index 292444cd..6aa1bc4d 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -38,7 +38,7 @@ class TodoPlugin;
class TodoSummaryWidget : public Kontact::Summary
{
- Q_OBJECT
+ TQ_OBJECT
public: