1 files changed, 18 insertions, 18 deletions

diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index b38e6a79..91fb5d59 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -41,7 +41,7 @@
 #include <kdcopservicestarter.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kaudioplayer.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
@@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
   // User3 => Dismiss Selected
   //    Ok => Suspend
 
-  connect( calendar, TQT_SIGNAL(calendarChanged()),
-           this, TQT_SLOT(slotCalendarChanged()) );
+  connect( calendar, TQ_SIGNAL(calendarChanged()),
+           this, TQ_SLOT(slotCalendarChanged()) );
 
   TDEGlobal::iconLoader()->addAppDir( "tdepim" );
   setButtonOK( i18n( "Suspend" ) );
@@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
   TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox );
   topLayout->addWidget( label );
 
-  mSplitter = new TQSplitter( Qt::Vertical, topBox );
+  mSplitter = new TQSplitter( TQt::Vertical, topBox );
   mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   topLayout->addWidget( mSplitter );
 
@@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
   mIncidenceListView->setShowSortIndicator( true );
   mIncidenceListView->setAllColumnsShowFocus( true );
   mIncidenceListView->setSelectionMode( TQListView::Extended );
-  connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
-  connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) );
-  connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) );
-  connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) );
+  connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) );
+  connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) );
+  connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) );
+  connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) );
 
   mDetailView = new KOEventViewer( mCalendar, mSplitter );
   mDetailView->setFocus(); // set focus here to start with to make it harder
@@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
   mSuspendUnit->insertItem( i18n("week(s)") );
   mSuspendUnit->setCurrentItem( defSuspendUnit );
 
-  connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) );
+  connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) );
 
   setMainWidget( mIncidenceListView );
   mIncidenceListView->setMinimumSize( 500, 50 );
@@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary )
 
 void AlarmDialog::readLayout()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Layout" );
   TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
   if ( sizes.count() == 2 ) {
@@ -215,7 +215,7 @@ void AlarmDialog::readLayout()
 
 void AlarmDialog::writeLayout()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Layout" );
   TQValueList<int> list = mSplitter->sizes();
   config->writeEntry( "SplitterSizes", list );
@@ -344,7 +344,7 @@ void AlarmDialog::edit()
   arg << incidence->uid();
   arg << dt;
   //kdDebug(5890) << "editing incidence " << incidence->summary() << endl;
-  if ( !kapp->dcopClient()->send( "korganizer", "KOrganizerIface",
+  if ( !tdeApp->dcopClient()->send( "korganizer", "KOrganizerIface",
                                   "editIncidence(TQString,TQDate)",
                                   data ) ) {
     KMessageBox::error(
@@ -356,9 +356,9 @@ void AlarmDialog::edit()
   // get desktop # where korganizer (or kontact) runs
   TQByteArray replyData;
   TQCString object, replyType;
-  object = kapp->dcopClient()->isApplicationRegistered( "kontact" ) ?
+  object = tdeApp->dcopClient()->isApplicationRegistered( "kontact" ) ?
            "kontact-mainwindow#1" : "KOrganizer MainWindow";
-  if (!kapp->dcopClient()->call( "korganizer", object,
+  if (!tdeApp->dcopClient()->call( "korganizer", object,
                             "getWinID()", 0, replyType, replyData, true, -1 ) ) {
   }
 
@@ -566,7 +566,7 @@ void AlarmDialog::wakeUp()
 
 void AlarmDialog::slotSave()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   TDELockFile::Ptr lock = config->lockFile();
   if ( lock.data()->lock() != TDELockFile::LockOK )
     return;
@@ -673,12 +673,12 @@ bool AlarmDialog::ensureKorganizerRunning() const
     // but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject(
+    if ( !tdeApp->dcopClient()->findObject(
            dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
-      DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper
+      DCOPRef ref( dcopService, dcopService ); // talk to TDEUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
-        Q_ASSERT( kapp->dcopClient()->findObject(
+        Q_ASSERT( tdeApp->dcopClient()->findObject(
                     dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else {
         kdWarning() << "Error loading " << dcopService << endl;