-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index b1b7ed4..9286f9f 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -684,65 +684,67 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
684 | #endif | 684 | #endif |
685 | 685 | ||
686 | applyStyle(); | 686 | applyStyle(); |
687 | 687 | ||
688 | if ( type() == GuiServer ) { | 688 | if ( type() == GuiServer ) { |
689 | setVolume(); | 689 | setVolume(); |
690 | } | 690 | } |
691 | 691 | ||
692 | installEventFilter( this ); | 692 | installEventFilter( this ); |
693 | 693 | ||
694 | QPEMenuToolFocusManager::initialize(); | 694 | QPEMenuToolFocusManager::initialize(); |
695 | 695 | ||
696 | #ifdef QT_NO_QWS_CURSOR | 696 | #ifdef QT_NO_QWS_CURSOR |
697 | // if we have no cursor, probably don't want tooltips | 697 | // if we have no cursor, probably don't want tooltips |
698 | QToolTip::setEnabled( FALSE ); | 698 | QToolTip::setEnabled( FALSE ); |
699 | #endif | 699 | #endif |
700 | } | 700 | } |
701 | 701 | ||
702 | 702 | ||
703 | #ifdef QTOPIA_INTERNAL_INITAPP | 703 | #ifdef QTOPIA_INTERNAL_INITAPP |
704 | void QPEApplication::initApp( int argc, char **argv ) | 704 | void QPEApplication::initApp( int argc, char **argv ) |
705 | { | 705 | { |
706 | delete pidChannel; | 706 | delete pidChannel; |
707 | d->keep_running = TRUE; | 707 | d->keep_running = TRUE; |
708 | d->preloaded = FALSE; | 708 | d->preloaded = FALSE; |
709 | d->forceshow = FALSE; | 709 | d->forceshow = FALSE; |
710 | 710 | ||
711 | QCString channel = QCString(argv[0]); | 711 | QCString channel = QCString(argv[0]); |
712 | 712 | ||
713 | channel.replace(QRegExp(".*/"),""); | 713 | channel.replace(QRegExp(".*/"),""); |
714 | d->appName = channel; | 714 | d->appName = channel; |
715 | 715 | ||
716 | #if QT_VERSION > 235 | ||
716 | qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6 | 717 | qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6 |
718 | #endif | ||
717 | 719 | ||
718 | channel = "QPE/Application/" + channel; | 720 | channel = "QPE/Application/" + channel; |
719 | pidChannel = new QCopChannel( channel, this); | 721 | pidChannel = new QCopChannel( channel, this); |
720 | connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), | 722 | connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)), |
721 | this, SLOT(pidMessage(const QCString &, const QByteArray &))); | 723 | this, SLOT(pidMessage(const QCString &, const QByteArray &))); |
722 | 724 | ||
723 | processQCopFile(); | 725 | processQCopFile(); |
724 | d->keep_running = d->qcopq.isEmpty(); | 726 | d->keep_running = d->qcopq.isEmpty(); |
725 | 727 | ||
726 | for (int a=0; a<argc; a++) { | 728 | for (int a=0; a<argc; a++) { |
727 | if ( qstrcmp(argv[a],"-preload")==0 ) { | 729 | if ( qstrcmp(argv[a],"-preload")==0 ) { |
728 | argv[a] = argv[a+1]; | 730 | argv[a] = argv[a+1]; |
729 | a++; | 731 | a++; |
730 | d->preloaded = TRUE; | 732 | d->preloaded = TRUE; |
731 | argc-=1; | 733 | argc-=1; |
732 | } else if ( qstrcmp(argv[a],"-preload-show")==0 ) { | 734 | } else if ( qstrcmp(argv[a],"-preload-show")==0 ) { |
733 | argv[a] = argv[a+1]; | 735 | argv[a] = argv[a+1]; |
734 | a++; | 736 | a++; |
735 | d->preloaded = TRUE; | 737 | d->preloaded = TRUE; |
736 | d->forceshow = TRUE; | 738 | d->forceshow = TRUE; |
737 | argc-=1; | 739 | argc-=1; |
738 | } | 740 | } |
739 | } | 741 | } |
740 | 742 | ||
741 | /* overide stored arguments */ | 743 | /* overide stored arguments */ |
742 | setArgs(argc, argv); | 744 | setArgs(argc, argv); |
743 | } | 745 | } |
744 | #endif | 746 | #endif |
745 | 747 | ||
746 | 748 | ||
747 | static QPtrDict<void>* inputMethodDict = 0; | 749 | static QPtrDict<void>* inputMethodDict = 0; |
748 | static void createInputMethodDict() | 750 | static void createInputMethodDict() |