diff options
Diffstat (limited to 'korganizer/korgac')
-rw-r--r-- | korganizer/korgac/alarmdialog.cpp | 22 | ||||
-rw-r--r-- | korganizer/korgac/alarmdialog.h | 7 | ||||
-rw-r--r-- | korganizer/korgac/alarmdockwindow.cpp | 6 | ||||
-rw-r--r-- | korganizer/korgac/alarmdockwindow.h | 5 | ||||
-rw-r--r-- | korganizer/korgac/koalarmclient.cpp | 16 | ||||
-rw-r--r-- | korganizer/korgac/koalarmclient.h | 9 | ||||
-rw-r--r-- | korganizer/korgac/korgacmain.cpp | 4 | ||||
-rw-r--r-- | korganizer/korgac/testalarmdlg.cpp | 4 |
8 files changed, 38 insertions, 35 deletions
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 6b12f76c2..e095950a4 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqhbox.h> @@ -65,8 +65,8 @@ static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks class AlarmListItem : public KListViewItem { public: - AlarmListItem( const TQString &uid, TQListView *parent ) - : KListViewItem( parent ), mUid( uid ), mNotified( false ) + AlarmListItem( const TQString &uid, TQListView *tqparent ) + : KListViewItem( tqparent ), mUid( uid ), mNotified( false ) { } @@ -96,10 +96,10 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co typedef TQValueList<AlarmListItem*> ItemList; -AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, const char *name ) +AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *tqparent, const char *name ) : KDialogBase( Plain, WType_TopLevel | WStyle_Customize | WStyle_StaysOnTop | WStyle_DialogBorder, - parent, name, false, i18n("Reminder"), + tqparent, name, false, i18n("Reminder"), Ok | User1 | User2 | User3, NoDefault, false, i18n("Edit..."), i18n("Dismiss All"), i18n("Dismiss Reminder") ), mCalendar( calendar ), mSuspendTimer(this) @@ -437,7 +437,7 @@ void AlarmDialog::setTimer() AlarmListItem * item = static_cast<AlarmListItem*>( it.current() ); if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) { int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt ); - nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs ); + nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs ); } } @@ -650,8 +650,8 @@ bool AlarmDialog::ensureKorganizerRunning() const TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->tqfindServiceFor( - "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); + int result = KDCOPServiceStarter::self()->findServiceFor( + "DCOP/Organizer", TQString(), TQString(), &error, &dcopService ); if ( result == 0 ) { // OK, so korganizer (or kontact) is running. Now ensure the object we @@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const // but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->tqfindObject( + if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->tqfindObject( + Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index 75208f654..e82832fad 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ALARMDIALOG_H #define ALARMDIALOG_H @@ -44,8 +44,9 @@ class TQSplitter; class AlarmDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 ); + explicit AlarmDialog( CalendarResources *calendar, TQWidget *tqparent = 0, const char *name = 0 ); ~AlarmDialog(); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 90360dc6a..27badddbb 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "alarmdockwindow.h" @@ -178,7 +178,7 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) { - kapp->startServiceByDesktopName( "korganizer", TQString::null ); + kapp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); } diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h index 548e39aa2..f73c667b6 100644 --- a/korganizer/korgac/alarmdockwindow.h +++ b/korganizer/korgac/alarmdockwindow.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ALARMDOCKWINDOW_H #define ALARMDOCKWINDOW_H @@ -31,6 +31,7 @@ class AlarmDockWindow : public KSystemTray { Q_OBJECT + TQ_OBJECT public: AlarmDockWindow( const char *name = 0 ); virtual ~AlarmDockWindow(); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 7ed25518a..c1254f12c 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koalarmclient.h" @@ -39,8 +39,8 @@ #include <tqpushbutton.h> -KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) - : DCOPObject( "ac" ), TQObject( parent, name ), mDialog( 0 ) +KOAlarmClient::KOAlarmClient( TQObject *tqparent, const char *name ) + : DCOPObject( "ac" ), TQObject( tqparent, name ), mDialog( 0 ) { kdDebug(5890) << "KOAlarmClient::KOAlarmClient()" << endl; @@ -116,8 +116,8 @@ void KOAlarmClient::checkAlarms() TQValueList<Alarm *>::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { - kdDebug(5891) << "REMINDER: " << (*it)->parent()->summary() << endl; - Incidence *incidence = mCalendar->incidence( (*it)->parent()->uid() ); + kdDebug(5891) << "REMINDER: " << (*it)->tqparent()->summary() << endl; + Incidence *incidence = mCalendar->incidence( (*it)->tqparent()->uid() ); createReminder( mCalendar, incidence, from, (*it)->text() ); } } @@ -163,7 +163,7 @@ void KOAlarmClient::quit() kapp->quit(); } -bool KOAlarmClient::commitData( QSessionManager& ) +bool KOAlarmClient::commitData( TQSessionManager& ) { emit saveAllSignal(); saveLastCheckTime(); @@ -201,7 +201,7 @@ TQStringList KOAlarmClient::dumpAlarms() TQValueList<Alarm*>::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { Alarm *a = *it; - lst << TQString(" ") + a->parent()->summary() + " (" + lst << TQString(" ") + a->tqparent()->summary() + " (" + a->time().toString() + ")"; } diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h index c8eee984e..b1b8c189c 100644 --- a/korganizer/korgac/koalarmclient.h +++ b/korganizer/korgac/koalarmclient.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOALARMCLIENT_H #define KOALARMCLIENT_H @@ -44,11 +44,12 @@ class Incidence; class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged { Q_OBJECT + TQ_OBJECT public: - KOAlarmClient( TQObject *parent = 0, const char *name = 0 ); + KOAlarmClient( TQObject *tqparent = 0, const char *name = 0 ); ~KOAlarmClient(); - bool commitData( QSessionManager & ); + bool commitData( TQSessionManager & ); // DCOP interface void quit(); diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index b4c9df7f6..6df1f0e16 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <stdlib.h> diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 7cf090e29..1d9159ae7 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqwidget.h> |