qdebugcleanup

23 files changed, 33 insertions, 129 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
@@ -104,3 +104,4 @@ int main( int argc, char *argv[] )
         for( it = standardAddressBook->begin(); it != standardAddressBook->end(); ++it ) { 
-            if ( (*it).isEmpty() || ! (*it).resource() )
+            // if ( (*it).isEmpty() || ! (*it).resource() )
+             if ( (*it).isEmpty()  )
                 continue;
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
@@ -131,3 +131,4 @@ int main( int argc, char *argv[] )
             ResourceCalendar * re = calendarResource->resource( (*it) );
-            if ( re ) {
+            //if ( re ) 
+                {
                 ++num;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 5aa1c9b..6697602 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -147,3 +147,2 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b)
             *b = true;
-            //qDebug("fooooooooooooooooooooooouuuuund ");
             break;
@@ -151,3 +150,2 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b)
     }
-    //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() );
     return fo;
@@ -370,3 +368,3 @@ void KDateNavigator::setShowWeekNums(bool enabled)
 {
-    qDebug("KDateNavigator::setShowWeekNums***************************** ");
+   
   m_bShowWeekNums = enabled;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b43c40e..b5a4199 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -918,3 +918,3 @@ void KOAgendaView::updateConfig()
         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 );
     }
@@ -1166,6 +1166,6 @@ void KOAgendaView::fillAgenda()
                         } 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 ) {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ecca374..17a1d13 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -499,3 +499,2 @@ void KODayMatrix::updateViewTimed()
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
-            qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF ");
             ushort recurType = event->recurrence()->doesRecur();
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 9df76e7..0045b7f 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -234,3 +234,3 @@ void KOEditorGeneral::pickAlarmSound()
 
-    qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
+    //qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
     
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 01c5773..47e73dd 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -941,3 +941,3 @@ void KOEditorRecurrence::readEvent(Incidence *event)
         recurrenceType = RecurrenceChooser::Yearly;
-            qDebug("Recurrence::rYearlyMonth: ");
+        //qDebug("Recurrence::rYearlyMonth: ");
             day = event->dtStart().date().day(); 
@@ -950,3 +950,3 @@ void KOEditorRecurrence::readEvent(Incidence *event)
 #if 0
-            qDebug("2day = %d ",day );
+            //qDebug("2day = %d ",day );
             QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
@@ -965,3 +965,3 @@ void KOEditorRecurrence::readEvent(Incidence *event)
     case Recurrence::rYearlyDay:
-        qDebug("Recurrence::rYearlyDay: ");
+        //qDebug("Recurrence::rYearlyDay: ");
         recurrenceType = RecurrenceChooser::Yearly;
@@ -1023,3 +1023,3 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
           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);
       }
@@ -1053,3 +1053,3 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
-        qDebug("RecurrenceChooser::Yearly ");
+        //qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index fefc778..f39b5e1 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -101,5 +101,3 @@ void KOEventViewer::printMe()
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
@@ -169,3 +167,2 @@ void KOEventViewer::setSource(const QString& n)
         if ( n.mid(7,3) == "ALL" ) {
-            qDebug("all ");
             mailToAttendees( true );
@@ -173,3 +170,2 @@ void KOEventViewer::setSource(const QString& n)
             mailToAttendees( false );
-            qDebug("rsvp ");
         } else {
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 8016034..9ece77f 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -34,6 +34,2 @@
 
-#ifndef KORG_NOKALARMD
-#include "kalarmdclient.h"
-#endif
-#include "simplealarmclient.h"
 
@@ -42,11 +38,2 @@
 
-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; }
-};
 
@@ -70,13 +57,2 @@ KOGlobals::KOGlobals()
 
-  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;
-  }
 }
@@ -96,3 +72,3 @@ KOGlobals::~KOGlobals()
 {
-  delete mAlarmClient;
+  
 }
@@ -104,7 +80,2 @@ const KCalendarSystem *KOGlobals::calendarSystem() const
 
-AlarmClient *KOGlobals::alarmClient() const
-{
-  return mAlarmClient;
-}
-
 void KOGlobals::fitDialogToScreen( QWidget *wid, bool force )
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 357ff5f..b3ff67b 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -45,4 +45,2 @@ class KOGlobals
 
-    AlarmClient *alarmClient() const;
-
   protected:
@@ -54,4 +52,3 @@ class KOGlobals
     
-    const KCalendarSystem *mCalendarSystem;    
-    AlarmClient *mAlarmClient;
+    const KCalendarSystem *mCalendarSystem;  
 };
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 51df123..9813a80 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -44,3 +44,2 @@
 #include "koprefs.h"
-#include "koglobals.h"
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 341f473..e1b393d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -333,2 +333,3 @@ KOListView::~KOListView()
 }
+
 QString KOListView::getWhatsThisText(QPoint p)
@@ -430,2 +431,3 @@ void  KOListView::setAlarm()
     calendar()->reInitAlarmSettings();
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
@@ -477,2 +479,3 @@ void KOListView::setCategories( bool removeOld )
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
@@ -701,2 +704,3 @@ void KOListView::writeToFile( bool iCal )
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
@@ -831,4 +835,7 @@ void KOListView::hideDates()
 }
+
 void KOListView::resetFocus()
-{
+{ 
+    topLevelWidget()->setActiveWindow();
+    topLevelWidget()->raise();
     mListView->setFocus();
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index bb0e23e..eb5bb6e 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -261,3 +261,2 @@ class KOListView : public KOEventView
     QString getWhatsThisText(QPoint p);
-    void resetFocus();
  signals:
@@ -267,2 +266,3 @@ class KOListView : public KOEventView
   public slots:
+    void resetFocus();
     virtual void updateView();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 2b7e41f..843526d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -289,3 +289,2 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
-    //qDebug("NEWWWWWWWWWWWWW ");
 }
@@ -302,3 +301,2 @@ void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
     mdayPos = 0;
-    //qDebug("recucleeeeeeeeeeeeeeeee ");
 }
@@ -308,6 +306,4 @@ void MonthViewItem::paint(QPainter *p)
     if ( mblockRepaint ) {
-        //qDebug("block ");
         return;
     }
-    //qDebug("NON block ");
 #if QT_VERSION >= 0x030000
@@ -462,3 +458,2 @@ int MonthViewItem::width(const QListBox *lb) const
         return 10;
-    //qDebug("ret wid %d ", lb->width());
     return lb->width();
@@ -614,8 +609,3 @@ void MonthViewCell::startUpdateCell()
     }
-    /*    
-          if ( !isVisible() ){
-          return;
-          }
-    */
-    // qDebug("MonthViewCell::updateCell() ");
+   
     setPrimary( mDate.month()%2 );
@@ -873,3 +863,2 @@ void MonthViewCell::updateCell()
 {
-    //qDebug("MonthViewCell::updateCell() ");
     if ( !mMonthView->isUpdatePossible() )
@@ -1055,3 +1044,2 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
     mMonthView->setSelectedCell( this );
-    qDebug("CELL ");
     if ( item == 0 ) {
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 1a81c7d..d88c300 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -137,3 +137,2 @@ HEADERS += datenavigatorcontainer.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
@@ -197,3 +196,2 @@ filteredit_base.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 91b5a01..553c265 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -87,3 +87,2 @@ HEADERS = datenavigatorcontainer.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
@@ -146,3 +145,2 @@ SOURCES = datenavigatorcontainer.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index dd2c081..0a608dc 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -710,8 +710,3 @@ void KOTodoView::updateView()
   }
-//   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()) {
@@ -722,3 +717,2 @@ void KOTodoView::updateView()
   }
-  //qDebug("for end ");
   // Restore opened/closed state
@@ -914,3 +908,2 @@ void KOTodoView::editItem(QListViewItem *item )
 {
-    // qDebug("editItem(QListViewItem *item ) ");
   emit editTodoSignal(((KOTodoViewItem *)item)->todo());
@@ -1098,3 +1091,3 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
     int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
-    qDebug("ROW %d ", row);
+    //qDebug("ROW %d ", row);
     if (!item) {
@@ -1172,21 +1165,3 @@ void KOTodoView::itemClicked(QListViewItem *item)
   }
-#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
+
 }
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f1f2dd2..3aa9b6c 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -552,11 +552,3 @@ void KOViewManager::showWeekView()
 {
-    /*
-      globalFlagBlockAgenda = 2;
-      qDebug("4globalFlagBlockAgenda = 2; ");
-      //globalFlagBlockPainting = true;
-      mMainView->dateNavigator()->selectWeek();
-      showAgendaView();
-    */
-
-
+   
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 8473db9..65d8ac3 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -86,5 +86,3 @@ void WhatsNextTextBrowser::printMe()
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 61a0931..df9b2fc 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -339,3 +339,2 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
   case Key_Backspace:
-      qDebug("+++++++++++back ");
       if ( cpos >  0) {
@@ -350,3 +349,2 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
       changedText();
-      qDebug("---------back ");
       }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e5d108..95bef66 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -62,3 +62,2 @@
 #include "kconfig.h"
-#include "simplealarmclient.h"
 #include "externalapphandler.h"
@@ -287,3 +286,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         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";
@@ -420,3 +418,3 @@ void MainWindow::toggleBeamReceive()
     if ( infrared ) {
-        qDebug("disable BeamReceive ");
+        qDebug("KO: Disable BeamReceive ");
         delete infrared;
@@ -426,3 +424,3 @@ void MainWindow::toggleBeamReceive()
     } 
-    qDebug("enable BeamReceive ");
+    qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index f2a6c60..45ed04d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -12,3 +12,2 @@
 #include <libkcal/incidence.h>
-#include "simplealarmclient.h"
 #include <ksyncmanager.h>
@@ -33,9 +32,2 @@ 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;
@@ -166,3 +158,2 @@ class MainWindow : public QMainWindow
     void closeEvent( QCloseEvent* ce );
-    SimpleAlarmClient mAlarmClient;
     QTimer mSaveTimer;
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 7a945e3..de65b53 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -447,3 +447,3 @@ void SearchDialog::keyPressEvent ( QKeyEvent *e)
     case Qt::Key_Escape:
-        hide();
+        close();
         break;
@@ -451,3 +451,2 @@ void SearchDialog::keyPressEvent ( QKeyEvent *e)
         if ( e->state() == Qt::ControlButton ) {
-            qDebug("full ");