-rw-r--r-- | korganizer/mainwindow.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8e5d108..95bef66 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -60,7 +60,6 @@ | |||
60 | #include "ktoolbar.h" | 60 | #include "ktoolbar.h" |
61 | #include "klocale.h" | 61 | #include "klocale.h" |
62 | #include "kconfig.h" | 62 | #include "kconfig.h" |
63 | #include "simplealarmclient.h" | ||
64 | #include "externalapphandler.h" | 63 | #include "externalapphandler.h" |
65 | 64 | ||
66 | using namespace KCal; | 65 | using namespace KCal; |
@@ -285,7 +284,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
285 | if( !QFile::exists( defaultFileName() ) ) { | 284 | if( !QFile::exists( defaultFileName() ) ) { |
286 | QFileInfo finfo ( defaultFileName() ); | 285 | QFileInfo finfo ( defaultFileName() ); |
287 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 286 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
288 | qDebug("oldfile %s ", oldFile.latin1()); | ||
289 | 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"; | 287 | 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"; |
290 | finfo.setFile( oldFile ); | 288 | finfo.setFile( oldFile ); |
291 | if (finfo.exists() ) { | 289 | if (finfo.exists() ) { |
@@ -418,13 +416,13 @@ void MainWindow::toggleBeamReceive() | |||
418 | return; | 416 | return; |
419 | #ifndef DESKTOP_VERSION | 417 | #ifndef DESKTOP_VERSION |
420 | if ( infrared ) { | 418 | if ( infrared ) { |
421 | qDebug("disable BeamReceive "); | 419 | qDebug("KO: Disable BeamReceive "); |
422 | delete infrared; | 420 | delete infrared; |
423 | infrared = 0; | 421 | infrared = 0; |
424 | brAction->setOn(false); | 422 | brAction->setOn(false); |
425 | return; | 423 | return; |
426 | } | 424 | } |
427 | qDebug("enable BeamReceive "); | 425 | qDebug("KO: Enable BeamReceive "); |
428 | brAction->setOn(true); | 426 | brAction->setOn(true); |
429 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; | 427 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; |
430 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); | 428 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); |