23 files changed, 29 insertions, 125 deletions

diff --git a/kde2file/abdump/main.cpp b/kde2file/abdump/main.cpp
index b359cfe..824d054 100644
--- a/kde2file/abdump/main.cpp
+++ b/kde2file/abdump/main.cpp
@@ -101,9 +101,10 @@ int main( int argc, char *argv[] )
         KABC::AddressBook::Iterator it;
         KABC::VCardConverter converter;
         QString datastream;
         for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { 
-            if ( (*it).isEmpty() || ! (*it).resource() )
+            // if ( (*it).isEmpty() || ! (*it).resource() )
+             if ( (*it).isEmpty()  )
                 continue;
             KABC::Addressee a = ( *it );
             QString vcard = converter.createVCard( a );
             vcard += QString("\r\n");
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 9cc1a73..c8755cd 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -128,9 +128,10 @@ int main( int argc, char *argv[] )
         Incidence::List::ConstIterator it;
         int num = 0;
         for( it = allInc.begin(); it != allInc.end(); ++it ) {
             ResourceCalendar * re = calendarResource->resource( (*it) );
-            if ( re ) {
+            //if ( re ) 
+                {
                 ++num;
                 Incidence* cl = (*it)->clone();
                 cl->setLastModified( (*it)->lastModified() );
                 if ( cl->type() == "Journal" )
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 5aa1c9b..6697602 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -144,13 +144,11 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b)
                 if (  si.width() < sizeHintTwoButtons( 4 ).width())
                     continue;
             }
             *b = true;
-            //qDebug("fooooooooooooooooooooooouuuuund ");
             break;
         }
     }
-    //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() );
     return fo;
 }
 QSize KDateNavigator::sizeHint() const
 {
@@ -367,9 +365,9 @@ void KDateNavigator::updateConfig()
 }
 
 void KDateNavigator::setShowWeekNums(bool enabled)
 {
-    qDebug("KDateNavigator::setShowWeekNums***************************** ");
+   
   m_bShowWeekNums = enabled;
   for(int i=0; i<6; i++) {
     if(enabled)
       weeknos[i]->show();
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b43c40e..b5a4199 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -915,9 +915,9 @@ void KOAgendaView::updateConfig()
         return;
     if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
         int old = KOPrefs::instance()->mHourSize;
         KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
-        qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
+        //qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
     }
 
 
     // update config for children
@@ -1163,12 +1163,12 @@ void KOAgendaView::fillAgenda()
                             endX +=  curCol;
                             beginX = curCol;
                             mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                         } else {
-                            qDebug("days %d %s",endX , currentDate.toString().latin1());
+                            //qDebug("days %d %s",endX , currentDate.toString().latin1());
                             QDate dateit = currentDate.addDays( -endX );
                             if ( event->recursOn( dateit ) ) {
-                                qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
+                                //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
                                 if ( curCol-endX < 0 ) {
                                     mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
                                 }
                             }
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ecca374..17a1d13 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -496,9 +496,8 @@ void KODayMatrix::updateViewTimed()
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
-            qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF ");
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 9df76e7..0045b7f 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -231,9 +231,9 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
 
 void KOEditorGeneral::pickAlarmSound()
 {
 
-    qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
+    //qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
     
     bool oldState = mAlarmSoundButton->isOn();
    
     QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 01c5773..47e73dd 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -938,18 +938,18 @@ void KOEditorRecurrence::readEvent(Incidence *event)
       break;
     case Recurrence::rYearlyMonth:
         {
         recurrenceType = RecurrenceChooser::Yearly;
-            qDebug("Recurrence::rYearlyMonth: ");
+        //qDebug("Recurrence::rYearlyMonth: ");
             day = event->dtStart().date().day(); 
             rmd = r->yearNums();
             if ( rmd.count() > 0 )
                 month = *rmd.first();
             else
                 month = event->dtStart().date().month() ;
             mYearly->setByMonth( month, day );
 #if 0
-            qDebug("2day = %d ",day );
+            //qDebug("2day = %d ",day );
             QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
             int month;
             if ( !monthlist.isEmpty() ) {
                 month =  monthlist.first()->rPos ;
@@ -962,9 +962,9 @@ void KOEditorRecurrence::readEvent(Incidence *event)
         }
 
       break;
     case Recurrence::rYearlyDay:
-        qDebug("Recurrence::rYearlyDay: ");
+        //qDebug("Recurrence::rYearlyDay: ");
         recurrenceType = RecurrenceChooser::Yearly;
         mYearly->setByDay( event->dtStart().date().dayOfYear() );
         mYearly->setFrequency( f );
         break;
@@ -1020,9 +1020,9 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
           found |=days.at(j);
       }
       if ( !found ) {
           days.setBit( event->dtStart().date().dayOfWeek()-1);
-          qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
+          //qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
       }
       if ( duration != 0 ) r->setWeekly( freq, days, duration );
       else r->setWeekly( freq, days, endDate );
     } else if ( recurrenceType == RecurrenceChooser::Monthly ) {
@@ -1050,9 +1050,9 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
         }
         r->addMonthlyDay( day );
       }
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
-        qDebug("RecurrenceChooser::Yearly ");
+        //qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
       if ( mYearly->byDay() ) {
           if ( duration != 0 ) {
               r->setYearly( Recurrence::rYearlyDay, freq, duration );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index fefc778..f39b5e1 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -98,11 +98,9 @@ void KOEventViewer::printMe()
     else
         scale = dy;
 
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
@@ -166,13 +164,11 @@ void KOEventViewer::setSource(const QString& n)
     if ( n.left(6) == "mailto" ) {
         // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1());
 #ifndef DESKTOP_VERSION
         if ( n.mid(7,3) == "ALL" ) {
-            qDebug("all ");
             mailToAttendees( true );
         } else if ( n.mid(7,4) == "RSVP"  ) {
             mailToAttendees( false );
-            qDebug("rsvp ");
         } else {
         QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
         e << n.mid(7);
         }
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 8016034..9ece77f 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -31,25 +31,12 @@
 #include <klocale.h>
 
 #include <kcalendarsystem.h>
 
-#ifndef KORG_NOKALARMD
-#include "kalarmdclient.h"
-#endif
-#include "simplealarmclient.h"
 
 #include "koglobals.h"
 #include "koprefs.h"
 
-class NopAlarmClient : public AlarmClient
-{
-  public:
-    void startDaemon() {}
-    bool setCalendars( const QStringList & ) { return false; }
-    bool addCalendar( const QString & ) { return false; }
-    bool removeCalendar( const QString & ) { return false; }
-    bool reloadCalendar( const QString & ) { return false; }
-};
 
 KOGlobals *KOGlobals::mSelf = 0;
 
 KOGlobals *KOGlobals::self()
@@ -67,19 +54,8 @@ KOGlobals::KOGlobals()
 
   cfg->setGroup("General");
   mCalendarSystem = KGlobal::locale()->calendar();
 
-  cfg->setGroup("AlarmDaemon");
-  QString alarmClient = cfg->readEntry( "Daemon", "kalarmd" );
-  if ( alarmClient == "simple" ) {
-    mAlarmClient = new SimpleAlarmClient;
-#ifndef KORG_NOKALARMD
-  } else if ( alarmClient == "kalarmd" ) {
-    mAlarmClient = new KalarmdClient;
-#endif
-  } else {
-    mAlarmClient = new NopAlarmClient;
-  }
 }
 
 KConfig* KOGlobals::config()
 {
@@ -93,21 +69,16 @@ KConfig* KOGlobals::config()
 }
 
 KOGlobals::~KOGlobals()
 {
-  delete mAlarmClient;
+  
 }
 
 const KCalendarSystem *KOGlobals::calendarSystem() const
 {
   return mCalendarSystem;
 }
 
-AlarmClient *KOGlobals::alarmClient() const
-{
-  return mAlarmClient;
-}
-
 void KOGlobals::fitDialogToScreen( QWidget *wid, bool force )
 {
   bool resized = false;
 
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 357ff5f..b3ff67b 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -42,18 +42,15 @@ class KOGlobals
     static bool reverseLayout();
 
     const KCalendarSystem *calendarSystem() const;
 
-    AlarmClient *alarmClient() const;
-
   protected:
     KOGlobals();
     ~KOGlobals();
     
   private:
     static KOGlobals *mSelf;
     
     const KCalendarSystem *mCalendarSystem;    
-    AlarmClient *mAlarmClient;
 };
 
 #endif
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 51df123..9813a80 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -41,9 +41,8 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
 #include "koprefs.h"
-#include "koglobals.h"
 
 #include "koincidenceeditor.h"
 
 KOIncidenceEditor::KOIncidenceEditor( const QString &caption, 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 341f473..e1b393d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -330,8 +330,9 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 }
+
 QString KOListView::getWhatsThisText(QPoint p)
 {
     KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
     if ( item )
@@ -427,8 +428,9 @@ void  KOListView::setAlarm()
     }
     topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
@@ -474,8 +476,9 @@ void KOListView::setCategories( bool removeOld )
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
@@ -698,8 +701,9 @@ void KOListView::writeToFile( bool iCal )
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
         }
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::deleteAll()
 {
     int icount = 0;
@@ -828,10 +832,13 @@ void KOListView::showDates()
 void KOListView::hideDates()
 {
     showDates(false);
 }
+
 void KOListView::resetFocus()
 {
+    topLevelWidget()->setActiveWindow();
+    topLevelWidget()->raise();
     mListView->setFocus();
 }
 void KOListView::updateView()
 {
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index bb0e23e..eb5bb6e 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -258,14 +258,14 @@ class KOListView : public KOEventView
     void updateList();
     void setStartDate(const QDate &start);
     int count();
     QString getWhatsThisText(QPoint p);
-    void resetFocus();
  signals:
     void signalNewEvent();
     void beamIncidenceList(QPtrList<Incidence>);
 
   public slots:
+    void resetFocus();
     virtual void updateView();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
     void clearSelection();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 2b7e41f..843526d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -286,9 +286,8 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     mReply = false;
     mInfo = false;
     mdayPos = 0;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
-    //qDebug("NEWWWWWWWWWWWWW ");
 }
 void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
 {
     setText( s );
@@ -299,18 +298,15 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
     mAlarm = false;
     mReply = false;
     mInfo = false; 
     mdayPos = 0;
-    //qDebug("recucleeeeeeeeeeeeeeeee ");
 }
 
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint ) {
-        //qDebug("block ");
         return;
     }
-    //qDebug("NON block ");
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
@@ -459,9 +455,8 @@ int MonthViewItem::width(const QListBox *lb) const
         return( x + lb->fontMetrics().width( text() ) + 1 );
     }
     if ( ! lb )
         return 10;
-    //qDebug("ret wid %d ", lb->width());
     return lb->width();
 }
 
 
@@ -611,14 +606,9 @@ void MonthViewCell::startUpdateCell()
         mAvailItemList.setAutoDelete( true );
         mAvailItemList.clear();
         mAvailItemList.setAutoDelete( false );
     }
-    /*    
-          if ( !isVisible() ){
-          return;
-          }
-    */
-    // qDebug("MonthViewCell::updateCell() ");
+   
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         setLineWidth( 3 );
@@ -870,9 +860,8 @@ void MonthViewCell::finishUpdateCell()
 
 }
 void MonthViewCell::updateCell()
 {
-    //qDebug("MonthViewCell::updateCell() ");
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
@@ -1052,9 +1041,8 @@ void MonthViewCell::newEvent()
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     mMonthView->setSelectedCell( this );
-    qDebug("CELL ");
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 1a81c7d..d88c300 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -134,9 +134,8 @@ HEADERS += datenavigatorcontainer.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
@@ -194,9 +193,8 @@ filteredit_base.cpp \
  publishdialog.cpp \
  publishdialog_base.cpp \
  savetemplatedialog.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 91b5a01..553c265 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -84,9 +84,8 @@ HEADERS = datenavigatorcontainer.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
@@ -143,9 +142,8 @@ SOURCES = datenavigatorcontainer.cpp \
  publishdialog.cpp \
  publishdialog_base.cpp \
  savetemplatedialog.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index dd2c081..0a608dc 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -707,21 +707,15 @@ void KOTodoView::updateView()
       }
       if ( next )
           todo = todoList.next();
   }
-//   qDebug("again .... ");
-//   for(todo = todoList.first(); todo; todo = todoList.next()) {
       
-//       qDebug("yytodo %s ", todo->summary().latin1());
-//   }
-  //qDebug("for  ");
   for(todo = todoList.first(); todo; todo = todoList.next()) {
       if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
       {
       insertTodoItem(todo);
     }
   }
-  //qDebug("for end ");
   // Restore opened/closed state
   mTodoListView->blockSignals( true );
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
@@ -911,9 +905,8 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 }
 
 void KOTodoView::editItem(QListViewItem *item )
 {
-    // qDebug("editItem(QListViewItem *item ) ");
   emit editTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
 void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
@@ -1095,9 +1088,9 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     }
     pendingSubtodo = 0;
     //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
-    qDebug("ROW %d ", row);
+    //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
@@ -1169,27 +1162,9 @@ void KOTodoView::itemClicked(QListViewItem *item)
           emit reparentTodoSignal( newParent,newSub  );
           return;
       }
   }
-#if 0
-  // handled by the item itself
-  bool completed = todoItem->todo()->isCompleted();  // Completed or not?
-  qDebug("com %d ",completed );
-  qDebug("itemclicked ");
-  if (todoItem->isOn()) {
-      qDebug("on ");
-    if (!completed) {
-        qDebug("set true ");
-      todoItem->todo()->setCompleted(QDateTime::currentDateTime());
-    }
-  } else {
-      qDebug("not on ");
-    if (completed) {
-        qDebug("set false ");
-      todoItem->todo()->setCompleted(false);
-    }
-  }
-#endif
+
 }
 
 void KOTodoView::setDocumentId( const QString &id )
 {
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f1f2dd2..3aa9b6c 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -549,16 +549,8 @@ void KOViewManager::showWorkWeekView()
 }
 
 void KOViewManager::showWeekView()
 {
-    /*
-      globalFlagBlockAgenda = 2;
-      qDebug("4globalFlagBlockAgenda = 2; ");
-      //globalFlagBlockPainting = true;
-      mMainView->dateNavigator()->selectWeek();
-      showAgendaView();
-    */
-
 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 8473db9..65d8ac3 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -83,11 +83,9 @@ void WhatsNextTextBrowser::printMe()
         scale = dx;
     else
         scale = dy;
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 61a0931..df9b2fc 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -336,9 +336,8 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
   case Key_Next:
     addTime(QTime(1,0,0));
     break;
   case Key_Backspace:
-      qDebug("+++++++++++back ");
       if ( cpos >  0) {
           if ( cpos == 3 )
               --cpos;
           if ( cpos > 5)
@@ -347,9 +346,8 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
           lineEdit()->setText( text );
           lineEdit()->setCursorPosition(--cpos);
           setSelect ( cpos , 1 );
       changedText();
-      qDebug("---------back ");
       }
     break;
   } // switch arrows
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e5d108..95bef66 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -59,9 +59,8 @@
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
-#include "simplealarmclient.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
@@ -284,9 +283,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
-        qDebug("oldfile %s ", oldFile.latin1());
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
@@ -417,15 +415,15 @@ void MainWindow::toggleBeamReceive()
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
-        qDebug("disable BeamReceive ");
+        qDebug("KO: Disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
-    qDebug("enable BeamReceive ");
+    qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index f2a6c60..45ed04d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -9,9 +9,8 @@
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
-#include "simplealarmclient.h"
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
@@ -30,15 +29,8 @@ class QPEMenuBar;
 namespace KCal {
 class CalendarLocal;
 }
 
-class KOMenuBar : public QMenuBar
-{
-  public:
-    KOMenuBar(   QWidget *parent=0  ): QMenuBar (parent ) {;}
-        QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );}
-};
-
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
@@ -163,9 +155,8 @@ class MainWindow : public QMainWindow
     QAction *mToggleAllday;
     QAction *actionFilterMenuTB;
 
     void closeEvent( QCloseEvent* ce );
-    SimpleAlarmClient mAlarmClient;
     QTimer mSaveTimer;
     //bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 7a945e3..de65b53 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -444,13 +444,12 @@ void SearchDialog::search(const QRegExp &re)
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
     switch ( e->key() ) {
     case Qt::Key_Escape:
-        hide();
+        close();
         break;
     case Qt::Key_F:
         if ( e->state() == Qt::ControlButton ) {
-            qDebug("full ");
 
         }
         break;
     case Qt::Key_Return: