-rw-r--r-- | library/qpedecoration_qws.cpp | 7 | ||||
-rw-r--r-- | library/task-opie-applets.control | 0 | ||||
-rw-r--r-- | library/task-opie-complete.control | 0 | ||||
-rw-r--r-- | library/task-opie-games.control | 0 | ||||
-rw-r--r-- | library/task-opie-pim.control | 0 | ||||
-rw-r--r-- | library/task-opie-settings.control | 0 |
6 files changed, 5 insertions, 2 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index 708dd23..214c721 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -491,26 +491,28 @@ QPEDecoration::QPEDecoration() | |||
491 | wdiface->release(); | 491 | wdiface->release(); |
492 | wdlib->unload(); | 492 | wdlib->unload(); |
493 | delete wdlib; | 493 | delete wdlib; |
494 | wdlib = 0; | 494 | wdlib = 0; |
495 | } else { | 495 | } else { |
496 | delete wdiface; | 496 | delete wdiface; |
497 | } | 497 | } |
498 | wdiface = new DefaultWindowDecoration; | 498 | wdiface = new DefaultWindowDecoration; |
499 | 499 | ||
500 | helpFile = QString(qApp->argv()[0]) + ".html"; | 500 | helpFile = QString(qApp->argv()[0]) + ".html"; |
501 | QStringList helpPath = Global::helpPath(); | 501 | QStringList helpPath = Global::helpPath(); |
502 | helpExists = FALSE; | 502 | helpExists = FALSE; |
503 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) | 503 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { |
504 | helpExists = QFile::exists( *it + "/" + helpFile ); | 504 | helpExists = QFile::exists( *it + "/" + helpFile ); |
505 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); | ||
506 | } | ||
505 | qpeManager = new QPEManager( this ); | 507 | qpeManager = new QPEManager( this ); |
506 | } | 508 | } |
507 | 509 | ||
508 | QPEDecoration::QPEDecoration( const QString &plugin ) | 510 | QPEDecoration::QPEDecoration( const QString &plugin ) |
509 | : QWSDefaultDecoration() | 511 | : QWSDefaultDecoration() |
510 | { | 512 | { |
511 | if ( wdlib ) { | 513 | if ( wdlib ) { |
512 | wdiface->release(); | 514 | wdiface->release(); |
513 | wdlib->unload(); | 515 | wdlib->unload(); |
514 | delete wdlib; | 516 | delete wdlib; |
515 | wdlib = 0; | 517 | wdlib = 0; |
516 | } else { | 518 | } else { |
@@ -521,26 +523,27 @@ QPEDecoration::QPEDecoration( const QString &plugin ) | |||
521 | QLibrary *lib = new QLibrary( path + "/" + plugin ); | 523 | QLibrary *lib = new QLibrary( path + "/" + plugin ); |
522 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { | 524 | if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) { |
523 | wdiface = iface; | 525 | wdiface = iface; |
524 | wdlib = lib; | 526 | wdlib = lib; |
525 | } else { | 527 | } else { |
526 | delete lib; | 528 | delete lib; |
527 | wdiface = new DefaultWindowDecoration; | 529 | wdiface = new DefaultWindowDecoration; |
528 | } | 530 | } |
529 | 531 | ||
530 | helpFile = QString(qApp->argv()[0]) + ".html"; | 532 | helpFile = QString(qApp->argv()[0]) + ".html"; |
531 | QStringList helpPath = Global::helpPath(); | 533 | QStringList helpPath = Global::helpPath(); |
532 | helpExists = FALSE; | 534 | helpExists = FALSE; |
533 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) | 535 | for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { |
534 | helpExists = QFile::exists( *it + "/" + helpFile ); | 536 | helpExists = QFile::exists( *it + "/" + helpFile ); |
537 | qDebug ( "Checking %s/%s for help: %d", (*it).latin1(), helpFile.latin1(),helpExists); } | ||
535 | qpeManager = new QPEManager( this ); | 538 | qpeManager = new QPEManager( this ); |
536 | } | 539 | } |
537 | 540 | ||
538 | QPEDecoration::~QPEDecoration() | 541 | QPEDecoration::~QPEDecoration() |
539 | { | 542 | { |
540 | delete qpeManager; | 543 | delete qpeManager; |
541 | } | 544 | } |
542 | 545 | ||
543 | const char **QPEDecoration::menuPixmap() | 546 | const char **QPEDecoration::menuPixmap() |
544 | { | 547 | { |
545 | return (const char **)0; | 548 | return (const char **)0; |
546 | } | 549 | } |
diff --git a/library/task-opie-applets.control b/library/task-opie-applets.control index f0e7780..11e2eae 100644 --- a/library/task-opie-applets.control +++ b/library/task-opie-applets.control | |||
diff --git a/library/task-opie-complete.control b/library/task-opie-complete.control index 226a278..6dafc0c 100644 --- a/library/task-opie-complete.control +++ b/library/task-opie-complete.control | |||
diff --git a/library/task-opie-games.control b/library/task-opie-games.control index 014a56d..9695a40 100644 --- a/library/task-opie-games.control +++ b/library/task-opie-games.control | |||
diff --git a/library/task-opie-pim.control b/library/task-opie-pim.control index e971780..6df8c22 100644 --- a/library/task-opie-pim.control +++ b/library/task-opie-pim.control | |||
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control index 2fbb4e8..0b572b0 100644 --- a/library/task-opie-settings.control +++ b/library/task-opie-settings.control | |||