-rw-r--r-- | library/Makefile.in | 26 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 4 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 4 |
4 files changed, 17 insertions, 19 deletions
diff --git a/library/Makefile.in b/library/Makefile.in index c89390f..b74b818 100644 --- a/library/Makefile.in +++ b/library/Makefile.in | |||
@@ -1,73 +1,73 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include -Ibackend | 9 | INCPATH =-I$(OPIEDIR)/include -Ibackend |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QTDIR)/lib$(PROJMAK)/ | 17 | DESTDIR = $(QTDIR)/lib$(PROJMAK)/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 5 | 19 | VER_MIN = 5 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= qpe | 21 | TARGET= qpe |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =calendar.h \ | 26 | HEADERS =calendar.h \ |
27 | global.h \ | 27 | global.h \ |
28 | resource.h \ | 28 | resource.h \ |
29 | xmlreader.h \ | 29 | xmlreader.h \ |
30 | mimetype.h \ | 30 | mimetype.h \ |
31 | menubutton.h \ | 31 | menubutton.h \ |
32 | network.h \ | 32 | network.h \ |
33 | networkinterface.h \ | 33 | networkinterface.h \ |
34 | proxies.h \ | 34 | proxies.h \ |
35 | filemanager.h \ | 35 | filemanager.h \ |
36 | fontmanager.h \ | 36 | fontmanager.h \ |
37 | qdawg.h \ | 37 | qdawg.h \ |
38 | datebookmonth.h \ | 38 | datebookmonth.h \ |
39 | fileselector.h \ | 39 | fileselector.h \ |
40 | imageedit.h \ | 40 | imageedit.h \ |
41 | qcopenvelope_qws.h \ | 41 | qcopenvelope_qws.h \ |
42 | qpedecoration_qws.h \ | 42 | qpedecoration_qws.h \ |
43 | qpeapplication.h \ | 43 | qpeapplication.h \ |
44 | qpestyle.h \ | 44 | qpestyle.h \ |
45 | qpedialog.h \ | 45 | qpedialog.h \ |
46 | lightstyle.h \ | 46 | lightstyle.h \ |
47 | config.h \ | 47 | config.h \ |
48 | applnk.h \ | 48 | applnk.h \ |
49 | sound.h \ | 49 | sound.h \ |
50 | tzselect.h \ | 50 | tzselect.h \ |
51 | qmath.h \ | 51 | qmath.h \ |
52 | datebookdb.h \ | 52 | datebookdb.h \ |
53 | alarmserver.h \ | 53 | alarmserver.h \ |
54 | process.h \ | 54 | process.h \ |
55 | password.h \ | 55 | password.h \ |
56 | timestring.h \ | 56 | timestring.h \ |
57 | fontfactoryinterface.h \ | 57 | fontfactoryinterface.h \ |
58 | fontdatabase.h \ | 58 | fontdatabase.h \ |
59 | power.h \ | 59 | power.h \ |
60 | storage.h \ | 60 | storage.h \ |
61 | qpemessagebox.h \ | 61 | qpemessagebox.h \ |
62 | backend/timeconversion.h \ | 62 | backend/timeconversion.h \ |
63 | qpedebug.h \ | 63 | qpedebug.h \ |
64 | qpemenubar.h \ | 64 | qpemenubar.h \ |
65 | qpetoolbar.h \ | 65 | qpetoolbar.h \ |
66 | backend/categories.h \ | 66 | backend/categories.h \ |
67 | backend/stringutil.h \ | 67 | backend/stringutil.h \ |
68 | backend/palmtopuid.h \ | 68 | backend/palmtopuid.h \ |
69 | backend/palmtoprecord.h \ | 69 | backend/palmtoprecord.h \ |
70 | backend/task.h \ | 70 | backend/task.h \ |
71 | backend/event.h \ | 71 | backend/event.h \ |
72 | backend/contact.h \ | 72 | backend/contact.h \ |
73 | categorymenu.h \ | 73 | categorymenu.h \ |
@@ -396,364 +396,362 @@ fontmanager.o: fontmanager.cpp \ | |||
396 | qdawg.o: qdawg.cpp \ | 396 | qdawg.o: qdawg.cpp \ |
397 | qdawg.h | 397 | qdawg.h |
398 | 398 | ||
399 | datebookmonth.o: datebookmonth.cpp \ | 399 | datebookmonth.o: datebookmonth.cpp \ |
400 | config.h \ | 400 | config.h \ |
401 | datebookmonth.h \ | 401 | datebookmonth.h \ |
402 | calendar.h \ | 402 | calendar.h \ |
403 | timestring.h \ | 403 | timestring.h \ |
404 | datebookdb.h \ | 404 | datebookdb.h \ |
405 | resource.h \ | 405 | resource.h \ |
406 | qpeapplication.h \ | 406 | qpeapplication.h \ |
407 | qpedecoration_qws.h | 407 | qpedecoration_qws.h |
408 | 408 | ||
409 | fileselector.o: fileselector.cpp \ | 409 | fileselector.o: fileselector.cpp \ |
410 | fileselector.h \ | 410 | fileselector.h \ |
411 | filemanager.h \ | 411 | filemanager.h \ |
412 | applnk.h \ | 412 | applnk.h \ |
413 | global.h \ | 413 | global.h \ |
414 | resource.h \ | 414 | resource.h \ |
415 | config.h \ | 415 | config.h \ |
416 | storage.h \ | 416 | storage.h \ |
417 | qpemenubar.h \ | 417 | qpemenubar.h \ |
418 | lnkproperties.h \ | 418 | lnkproperties.h \ |
419 | qpeapplication.h \ | 419 | qpeapplication.h \ |
420 | qpedecoration_qws.h \ | 420 | qpedecoration_qws.h \ |
421 | timestring.h \ | 421 | timestring.h \ |
422 | categorymenu.h | 422 | categorymenu.h |
423 | 423 | ||
424 | imageedit.o: imageedit.cpp \ | 424 | imageedit.o: imageedit.cpp \ |
425 | imageedit.h | 425 | imageedit.h |
426 | 426 | ||
427 | resource.o: resource.cpp \ | 427 | resource.o: resource.cpp \ |
428 | qpeapplication.h \ | 428 | qpeapplication.h \ |
429 | qpedecoration_qws.h \ | 429 | qpedecoration_qws.h \ |
430 | timestring.h \ | 430 | timestring.h \ |
431 | resource.h \ | 431 | resource.h \ |
432 | inlinepics_p.h | 432 | inlinepics_p.h |
433 | 433 | ||
434 | qpedecoration_qws.o: qpedecoration_qws.cpp \ | 434 | qpedecoration_qws.o: qpedecoration_qws.cpp \ |
435 | qcopenvelope_qws.h \ | 435 | qcopenvelope_qws.h \ |
436 | qpedecoration_qws.h \ | 436 | qpedecoration_qws.h \ |
437 | qpeapplication.h \ | 437 | qpeapplication.h \ |
438 | timestring.h \ | 438 | timestring.h \ |
439 | resource.h \ | 439 | resource.h \ |
440 | global.h | 440 | global.h |
441 | 441 | ||
442 | qcopenvelope_qws.o: qcopenvelope_qws.cpp \ | 442 | qcopenvelope_qws.o: qcopenvelope_qws.cpp \ |
443 | qcopenvelope_qws.h \ | 443 | qcopenvelope_qws.h \ |
444 | global.h | 444 | global.h |
445 | 445 | ||
446 | qpeapplication.o: qpeapplication.cpp \ | 446 | qpeapplication.o: qpeapplication.cpp \ |
447 | qcopenvelope_qws.h \ | 447 | qcopenvelope_qws.h \ |
448 | qpeapplication.h \ | 448 | qpeapplication.h \ |
449 | qpedecoration_qws.h \ | 449 | qpedecoration_qws.h \ |
450 | timestring.h \ | 450 | timestring.h \ |
451 | qpestyle.h \ | 451 | qpestyle.h \ |
452 | lightstyle.h \ | 452 | lightstyle.h \ |
453 | global.h \ | 453 | global.h \ |
454 | resource.h \ | 454 | resource.h \ |
455 | config.h \ | 455 | config.h \ |
456 | network.h \ | 456 | network.h \ |
457 | fontmanager.h \ | 457 | fontmanager.h \ |
458 | power.h \ | 458 | power.h \ |
459 | alarmserver.h \ | 459 | alarmserver.h \ |
460 | applnk.h | 460 | applnk.h \ |
461 | qpemenubar.h | ||
461 | 462 | ||
462 | qpestyle.o: qpestyle.cpp \ | 463 | qpestyle.o: qpestyle.cpp \ |
463 | qpestyle.h \ | 464 | qpestyle.h \ |
464 | qpeapplication.h \ | 465 | qpeapplication.h \ |
465 | qpedecoration_qws.h \ | 466 | qpedecoration_qws.h \ |
466 | timestring.h | 467 | timestring.h |
467 | 468 | ||
468 | qpedialog.o: qpedialog.cpp \ | 469 | qpedialog.o: qpedialog.cpp \ |
469 | qpedialog.h \ | 470 | qpedialog.h \ |
470 | qpeapplication.h \ | 471 | qpeapplication.h \ |
471 | qpedecoration_qws.h \ | 472 | qpedecoration_qws.h \ |
472 | timestring.h | 473 | timestring.h |
473 | 474 | ||
474 | lightstyle.o: lightstyle.cpp \ | 475 | lightstyle.o: lightstyle.cpp \ |
475 | lightstyle.h | 476 | lightstyle.h |
476 | 477 | ||
477 | config.o: config.cpp \ | 478 | config.o: config.cpp \ |
478 | config.h | 479 | config.h |
479 | 480 | ||
480 | applnk.o: applnk.cpp \ | 481 | applnk.o: applnk.cpp \ |
481 | applnk.h | 482 | applnk.h |
482 | 483 | ||
483 | sound.o: sound.cpp | 484 | sound.o: sound.cpp |
484 | 485 | ||
485 | tzselect.o: tzselect.cpp \ | 486 | tzselect.o: tzselect.cpp \ |
486 | tzselect.h \ | 487 | tzselect.h \ |
487 | resource.h \ | 488 | resource.h \ |
488 | global.h \ | 489 | global.h \ |
489 | config.h | 490 | config.h |
490 | 491 | ||
491 | qmath.o: qmath.c \ | 492 | qmath.o: qmath.c \ |
492 | qmath.h | 493 | qmath.h |
493 | 494 | ||
494 | datebookdb.o: datebookdb.cpp \ | 495 | datebookdb.o: datebookdb.cpp \ |
495 | datebookdb.h | 496 | datebookdb.h |
496 | 497 | ||
497 | alarmserver.o: alarmserver.cpp \ | 498 | alarmserver.o: alarmserver.cpp \ |
498 | qpeapplication.h \ | 499 | qpeapplication.h \ |
499 | qpedecoration_qws.h \ | 500 | qpedecoration_qws.h \ |
500 | timestring.h \ | 501 | timestring.h \ |
501 | global.h \ | 502 | global.h \ |
502 | resource.h \ | 503 | resource.h \ |
503 | qcopenvelope_qws.h \ | 504 | qcopenvelope_qws.h \ |
504 | alarmserver.h | 505 | alarmserver.h |
505 | 506 | ||
506 | password.o: password.cpp \ | 507 | password.o: password.cpp \ |
507 | password.moc \ | 508 | password.moc \ |
508 | password.h \ | 509 | password.h \ |
509 | config.h \ | 510 | config.h \ |
510 | global.h \ | 511 | global.h \ |
511 | backend/contact.h \ | 512 | backend/contact.h \ |
512 | passwordbase_p.h | 513 | passwordbase_p.h |
513 | 514 | ||
514 | process.o: process.cpp \ | 515 | process.o: process.cpp \ |
515 | process.h | 516 | process.h |
516 | 517 | ||
517 | process_unix.o: process_unix.cpp \ | 518 | process_unix.o: process_unix.cpp \ |
518 | process_unix.moc \ | 519 | process_unix.moc \ |
519 | process.h | 520 | process.h |
520 | 521 | ||
521 | timestring.o: timestring.cpp \ | 522 | timestring.o: timestring.cpp \ |
522 | timestring.moc \ | 523 | timestring.moc \ |
523 | timestring.h \ | 524 | timestring.h \ |
524 | qpeapplication.h \ | 525 | qpeapplication.h \ |
525 | qpedecoration_qws.h \ | 526 | qpedecoration_qws.h \ |
526 | config.h | 527 | config.h |
527 | 528 | ||
528 | fontdatabase.o: fontdatabase.cpp \ | 529 | fontdatabase.o: fontdatabase.cpp \ |
529 | qpeapplication.h \ | 530 | qpeapplication.h \ |
530 | qpedecoration_qws.h \ | 531 | qpedecoration_qws.h \ |
531 | timestring.h \ | 532 | timestring.h \ |
532 | fontfactoryinterface.h \ | 533 | fontfactoryinterface.h \ |
533 | fontdatabase.h | 534 | fontdatabase.h |
534 | 535 | ||
535 | power.o: power.cpp \ | 536 | power.o: power.cpp \ |
536 | power.h | 537 | power.h \ |
538 | custom.h | ||
537 | 539 | ||
538 | storage.o: storage.cpp | 540 | storage.o: storage.cpp |
539 | 541 | ||
540 | qpemessagebox.o: qpemessagebox.cpp \ | 542 | qpemessagebox.o: qpemessagebox.cpp \ |
541 | qpemessagebox.h | 543 | qpemessagebox.h |
542 | 544 | ||
543 | backend/timeconversion.o: backend/timeconversion.cpp \ | 545 | backend/timeconversion.o: backend/timeconversion.cpp \ |
544 | backend/timeconversion.h | 546 | backend/timeconversion.h |
545 | 547 | ||
546 | qpedebug.o: qpedebug.cpp \ | 548 | qpedebug.o: qpedebug.cpp \ |
547 | qpedebug.h | 549 | qpedebug.h |
548 | 550 | ||
549 | qpemenubar.o: qpemenubar.cpp \ | 551 | qpemenubar.o: qpemenubar.cpp \ |
550 | qpemenubar.h | 552 | qpemenubar.h |
551 | 553 | ||
552 | qpetoolbar.o: qpetoolbar.cpp \ | 554 | qpetoolbar.o: qpetoolbar.cpp \ |
553 | qpetoolbar.h \ | 555 | qpetoolbar.h \ |
554 | qpemenubar.h | 556 | qpemenubar.h |
555 | 557 | ||
556 | backend/categories.o: backend/categories.cpp \ | 558 | backend/categories.o: backend/categories.cpp \ |
557 | backend/categories.h \ | 559 | backend/categories.h \ |
558 | backend/qpcglobal.h \ | 560 | backend/qpcglobal.h \ |
559 | backend/palmtopuidgen.h \ | 561 | backend/palmtopuidgen.h \ |
560 | backend/stringutil.h | 562 | backend/stringutil.h |
561 | 563 | ||
562 | backend/stringutil.o: backend/stringutil.cpp \ | 564 | backend/stringutil.o: backend/stringutil.cpp \ |
563 | backend/stringutil.h \ | 565 | backend/stringutil.h \ |
564 | backend/qpcglobal.h | 566 | backend/qpcglobal.h |
565 | 567 | ||
566 | backend/palmtoprecord.o: backend/palmtoprecord.cpp \ | 568 | backend/palmtoprecord.o: backend/palmtoprecord.cpp \ |
567 | backend/palmtoprecord.h \ | 569 | backend/palmtoprecord.h \ |
568 | backend/qpcglobal.h \ | 570 | backend/qpcglobal.h \ |
569 | backend/palmtopuidgen.h \ | 571 | backend/palmtopuidgen.h \ |
570 | backend/stringutil.h | 572 | backend/stringutil.h |
571 | 573 | ||
572 | backend/task.o: backend/task.cpp \ | 574 | backend/task.o: backend/task.cpp \ |
573 | backend/vobject_p.h \ | 575 | backend/vobject_p.h \ |
574 | backend/timeconversion.h \ | 576 | backend/timeconversion.h \ |
575 | backend/qfiledirect_p.h | 577 | backend/qfiledirect_p.h |
576 | 578 | ||
577 | backend/event.o: backend/event.cpp \ | 579 | backend/event.o: backend/event.cpp \ |
578 | backend/event.h \ | 580 | backend/event.h \ |
579 | backend/qfiledirect_p.h \ | 581 | backend/qfiledirect_p.h \ |
580 | backend/vobject_p.h | 582 | backend/vobject_p.h |
581 | 583 | ||
582 | backend/contact.o: backend/contact.cpp \ | 584 | backend/contact.o: backend/contact.cpp \ |
583 | backend/contact.h \ | 585 | backend/contact.h \ |
584 | backend/vobject_p.h \ | 586 | backend/vobject_p.h \ |
585 | backend/qfiledirect_p.h | 587 | backend/qfiledirect_p.h |
586 | 588 | ||
587 | categorymenu.o: categorymenu.cpp \ | 589 | categorymenu.o: categorymenu.cpp \ |
588 | categorymenu.h \ | 590 | categorymenu.h \ |
589 | backend/categories.h \ | 591 | backend/categories.h \ |
590 | backend/qpcglobal.h \ | 592 | backend/qpcglobal.h \ |
591 | backend/palmtopuidgen.h \ | 593 | backend/palmtopuidgen.h \ |
592 | categoryselect.h | 594 | categoryselect.h |
593 | 595 | ||
594 | categoryedit_p.o: categoryedit_p.cpp \ | 596 | categoryedit_p.o: categoryedit_p.cpp \ |
595 | categoryedit_p.h \ | 597 | categoryedit_p.h \ |
596 | categoryeditbase_p.h | 598 | categoryeditbase_p.h |
597 | 599 | ||
598 | categoryselect.o: categoryselect.cpp \ | 600 | categoryselect.o: categoryselect.cpp \ |
599 | categorywidget.h \ | 601 | categorywidget.h \ |
600 | categoryselect.h | 602 | categoryselect.h |
601 | 603 | ||
602 | categorywidget.o: categorywidget.cpp \ | 604 | categorywidget.o: categorywidget.cpp \ |
603 | categoryedit_p.h \ | 605 | categoryedit_p.h \ |
604 | categoryeditbase_p.h \ | 606 | categoryeditbase_p.h \ |
605 | categorywidget.h | 607 | categorywidget.h |
606 | 608 | ||
607 | ir.o: ir.cpp \ | 609 | ir.o: ir.cpp \ |
608 | ir.h \ | 610 | ir.h \ |
609 | qcopenvelope_qws.h \ | 611 | qcopenvelope_qws.h \ |
610 | applnk.h | 612 | applnk.h |
611 | 613 | ||
612 | backend/vcc_yacc.o: backend/vcc_yacc.cpp \ | 614 | backend/vcc_yacc.o: backend/vcc_yacc.cpp \ |
613 | backend/vobject_p.h | 615 | backend/vobject_p.h \ |
616 | backend/qfiledirect_p.h | ||
614 | 617 | ||
615 | backend/vobject.o: backend/vobject.cpp \ | 618 | backend/vobject.o: backend/vobject.cpp \ |
616 | backend/vobject_p.h \ | 619 | backend/vobject_p.h \ |
617 | backend/qfiledirect_p.h | 620 | backend/qfiledirect_p.h |
618 | 621 | ||
619 | findwidget_p.o: findwidget_p.cpp \ | 622 | findwidget_p.o: findwidget_p.cpp \ |
620 | findwidget_p.h \ | 623 | findwidget_p.h \ |
621 | findwidgetbase_p.h | 624 | findwidgetbase_p.h |
622 | 625 | ||
623 | finddialog.o: finddialog.cpp \ | 626 | finddialog.o: finddialog.cpp \ |
624 | finddialog.h \ | 627 | finddialog.h \ |
625 | findwidget_p.h \ | 628 | findwidget_p.h \ |
626 | findwidgetbase_p.h | 629 | findwidgetbase_p.h |
627 | 630 | ||
628 | lnkproperties.o: lnkproperties.cpp \ | 631 | lnkproperties.o: lnkproperties.cpp \ |
629 | lnkproperties.h \ | 632 | lnkproperties.h \ |
630 | lnkpropertiesbase_p.h \ | 633 | lnkpropertiesbase_p.h \ |
631 | ir.h | 634 | ir.h |
632 | 635 | ||
633 | quuid.o: quuid.cpp \ | 636 | quuid.o: quuid.cpp \ |
634 | quuid.h | 637 | quuid.h |
635 | 638 | ||
636 | qlibrary.o: qlibrary.cpp \ | 639 | qlibrary.o: qlibrary.cpp \ |
637 | qlibrary_p.h \ | 640 | qlibrary_p.h \ |
638 | qlibrary.h | 641 | qlibrary.h |
639 | 642 | ||
640 | qlibrary_unix.o: qlibrary_unix.cpp \ | 643 | qlibrary_unix.o: qlibrary_unix.cpp \ |
641 | qlibrary_p.h \ | 644 | qlibrary_p.h \ |
642 | qlibrary.h | 645 | qlibrary.h |
643 | 646 | ||
644 | qprocess.o: qprocess.cpp \ | 647 | qprocess.o: qprocess.cpp \ |
645 | qprocess.h | 648 | qprocess.h |
646 | 649 | ||
647 | qprocess_unix.o: qprocess_unix.cpp \ | 650 | qprocess_unix.o: qprocess_unix.cpp \ |
648 | qprocess_unix.moc \ | 651 | qprocess_unix.moc \ |
649 | qprocess.h \ | 652 | qprocess.h \ |
650 | qcleanuphandler_p.h | 653 | qcleanuphandler_p.h |
651 | 654 | ||
652 | passwordbase_p.h: passwordbase_p.ui | 655 | passwordbase_p.h: passwordbase_p.ui |
653 | $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h | 656 | $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h |
654 | 657 | ||
655 | passwordbase_p.cpp: passwordbase_p.ui | 658 | passwordbase_p.cpp: passwordbase_p.ui |
656 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp | 659 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp |
657 | 660 | ||
658 | proxiesbase_p.h: proxiesbase_p.ui | 661 | proxiesbase_p.h: proxiesbase_p.ui |
659 | $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h | 662 | $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h |
660 | 663 | ||
661 | proxiesbase_p.cpp: proxiesbase_p.ui | 664 | proxiesbase_p.cpp: proxiesbase_p.ui |
662 | $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp | 665 | $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp |
663 | 666 | ||
664 | categoryeditbase_p.h: categoryeditbase_p.ui | 667 | categoryeditbase_p.h: categoryeditbase_p.ui |
665 | $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h | 668 | $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h |
666 | 669 | ||
667 | categoryeditbase_p.cpp: categoryeditbase_p.ui | 670 | categoryeditbase_p.cpp: categoryeditbase_p.ui |
668 | $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp | 671 | $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp |
669 | 672 | ||
670 | findwidgetbase_p.h: findwidgetbase_p.ui | 673 | findwidgetbase_p.h: findwidgetbase_p.ui |
671 | $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h | 674 | $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h |
672 | 675 | ||
673 | findwidgetbase_p.cpp: findwidgetbase_p.ui | 676 | findwidgetbase_p.cpp: findwidgetbase_p.ui |
674 | $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp | 677 | $(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp |
675 | 678 | ||
676 | lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui | 679 | lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui |
677 | $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h | 680 | $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h |
678 | 681 | ||
679 | lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui | 682 | lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui |
680 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp | 683 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp |
681 | 684 | ||
682 | passwordbase_p.o: passwordbase_p.cpp \ | 685 | passwordbase_p.o: passwordbase_p.cpp |
683 | passwordbase_p.h | ||
684 | 686 | ||
685 | proxiesbase_p.o: proxiesbase_p.cpp \ | 687 | proxiesbase_p.o: proxiesbase_p.cpp |
686 | proxiesbase_p.h | ||
687 | 688 | ||
688 | categoryeditbase_p.o: categoryeditbase_p.cpp \ | 689 | categoryeditbase_p.o: categoryeditbase_p.cpp |
689 | categoryeditbase_p.h | ||
690 | 690 | ||
691 | findwidgetbase_p.o: findwidgetbase_p.cpp \ | 691 | findwidgetbase_p.o: findwidgetbase_p.cpp |
692 | findwidgetbase_p.h | ||
693 | 692 | ||
694 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ | 693 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp |
695 | lnkpropertiesbase_p.h | ||
696 | 694 | ||
697 | moc_menubutton.o: moc_menubutton.cpp \ | 695 | moc_menubutton.o: moc_menubutton.cpp \ |
698 | menubutton.h | 696 | menubutton.h |
699 | 697 | ||
700 | moc_proxies.o: moc_proxies.cpp \ | 698 | moc_proxies.o: moc_proxies.cpp \ |
701 | proxies.h \ | 699 | proxies.h \ |
702 | config.h | 700 | config.h |
703 | 701 | ||
704 | moc_datebookmonth.o: moc_datebookmonth.cpp \ | 702 | moc_datebookmonth.o: moc_datebookmonth.cpp \ |
705 | datebookmonth.h \ | 703 | datebookmonth.h \ |
706 | calendar.h \ | 704 | calendar.h \ |
707 | timestring.h | 705 | timestring.h |
708 | 706 | ||
709 | moc_fileselector.o: moc_fileselector.cpp \ | 707 | moc_fileselector.o: moc_fileselector.cpp \ |
710 | fileselector.h \ | 708 | fileselector.h \ |
711 | filemanager.h \ | 709 | filemanager.h \ |
712 | applnk.h | 710 | applnk.h |
713 | 711 | ||
714 | moc_imageedit.o: moc_imageedit.cpp \ | 712 | moc_imageedit.o: moc_imageedit.cpp \ |
715 | imageedit.h | 713 | imageedit.h |
716 | 714 | ||
717 | moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ | 715 | moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ |
718 | qpedecoration_qws.h | 716 | qpedecoration_qws.h |
719 | 717 | ||
720 | moc_qpeapplication.o: moc_qpeapplication.cpp \ | 718 | moc_qpeapplication.o: moc_qpeapplication.cpp \ |
721 | qpeapplication.h \ | 719 | qpeapplication.h \ |
722 | qpedecoration_qws.h \ | 720 | qpedecoration_qws.h \ |
723 | timestring.h | 721 | timestring.h |
724 | 722 | ||
725 | moc_qpedialog.o: moc_qpedialog.cpp \ | 723 | moc_qpedialog.o: moc_qpedialog.cpp \ |
726 | qpedialog.h | 724 | qpedialog.h |
727 | 725 | ||
728 | moc_tzselect.o: moc_tzselect.cpp \ | 726 | moc_tzselect.o: moc_tzselect.cpp \ |
729 | tzselect.h | 727 | tzselect.h |
730 | 728 | ||
731 | moc_process.o: moc_process.cpp \ | 729 | moc_process.o: moc_process.cpp \ |
732 | process.h | 730 | process.h |
733 | 731 | ||
734 | moc_storage.o: moc_storage.cpp \ | 732 | moc_storage.o: moc_storage.cpp \ |
735 | storage.h | 733 | storage.h |
736 | 734 | ||
737 | moc_qpemenubar.o: moc_qpemenubar.cpp \ | 735 | moc_qpemenubar.o: moc_qpemenubar.cpp \ |
738 | qpemenubar.h | 736 | qpemenubar.h |
739 | 737 | ||
740 | moc_qpetoolbar.o: moc_qpetoolbar.cpp \ | 738 | moc_qpetoolbar.o: moc_qpetoolbar.cpp \ |
741 | qpetoolbar.h | 739 | qpetoolbar.h |
742 | 740 | ||
743 | backend/moc_categories.o: backend/moc_categories.cpp \ | 741 | backend/moc_categories.o: backend/moc_categories.cpp \ |
744 | backend/categories.h \ | 742 | backend/categories.h \ |
745 | backend/qpcglobal.h \ | 743 | backend/qpcglobal.h \ |
746 | backend/palmtopuidgen.h | 744 | backend/palmtopuidgen.h |
747 | 745 | ||
748 | moc_categorymenu.o: moc_categorymenu.cpp \ | 746 | moc_categorymenu.o: moc_categorymenu.cpp \ |
749 | categorymenu.h | 747 | categorymenu.h |
750 | 748 | ||
751 | moc_categoryedit_p.o: moc_categoryedit_p.cpp \ | 749 | moc_categoryedit_p.o: moc_categoryedit_p.cpp \ |
752 | categoryedit_p.h \ | 750 | categoryedit_p.h \ |
753 | categoryeditbase_p.h | 751 | categoryeditbase_p.h |
754 | 752 | ||
755 | moc_categoryselect.o: moc_categoryselect.cpp \ | 753 | moc_categoryselect.o: moc_categoryselect.cpp \ |
756 | categoryselect.h | 754 | categoryselect.h |
757 | 755 | ||
758 | moc_ir.o: moc_ir.cpp \ | 756 | moc_ir.o: moc_ir.cpp \ |
759 | ir.h | 757 | ir.h |
diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -73,129 +73,129 @@ public: | |||
73 | static bool isStarting( const QString name ); | 73 | static bool isStarting( const QString name ); |
74 | private slots: | 74 | private slots: |
75 | void handleNewChannel( const QString &); | 75 | void handleNewChannel( const QString &); |
76 | private: | 76 | private: |
77 | StartingAppList( QObject *parent=0, const char* name=0 ) ; | 77 | StartingAppList( QObject *parent=0, const char* name=0 ) ; |
78 | 78 | ||
79 | QDict<QTime> dict; | 79 | QDict<QTime> dict; |
80 | static StartingAppList *appl; | 80 | static StartingAppList *appl; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | StartingAppList* StartingAppList::appl = 0; | 83 | StartingAppList* StartingAppList::appl = 0; |
84 | 84 | ||
85 | StartingAppList::StartingAppList( QObject *parent, const char* name ) | 85 | StartingAppList::StartingAppList( QObject *parent, const char* name ) |
86 | :QObject( parent, name ) | 86 | :QObject( parent, name ) |
87 | { | 87 | { |
88 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 88 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
89 | connect( qwsServer, SIGNAL( newChannel(const QString&)), | 89 | connect( qwsServer, SIGNAL( newChannel(const QString&)), |
90 | this, SLOT( handleNewChannel(const QString&)) ); | 90 | this, SLOT( handleNewChannel(const QString&)) ); |
91 | dict.setAutoDelete( TRUE ); | 91 | dict.setAutoDelete( TRUE ); |
92 | #endif | 92 | #endif |
93 | } | 93 | } |
94 | 94 | ||
95 | void StartingAppList::add( const QString& name ) | 95 | void StartingAppList::add( const QString& name ) |
96 | { | 96 | { |
97 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 97 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
98 | if ( !appl ) | 98 | if ( !appl ) |
99 | appl = new StartingAppList; | 99 | appl = new StartingAppList; |
100 | QTime *t = new QTime; | 100 | QTime *t = new QTime; |
101 | t->start(); | 101 | t->start(); |
102 | appl->dict.insert( "QPE/Application/" + name, t ); | 102 | appl->dict.insert( "QPE/Application/" + name, t ); |
103 | #endif | 103 | #endif |
104 | } | 104 | } |
105 | 105 | ||
106 | bool StartingAppList::isStarting( const QString name ) | 106 | bool StartingAppList::isStarting( const QString name ) |
107 | { | 107 | { |
108 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 108 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
109 | if ( appl ) { | 109 | if ( appl ) { |
110 | QTime *t = appl->dict.find( "QPE/Application/" + name ); | 110 | QTime *t = appl->dict.find( "QPE/Application/" + name ); |
111 | if ( !t ) | 111 | if ( !t ) |
112 | return FALSE; | 112 | return FALSE; |
113 | if ( t->elapsed() > 10000 ) { | 113 | if ( t->elapsed() > 10000 ) { |
114 | // timeout in case of crash or something | 114 | // timeout in case of crash or something |
115 | appl->dict.remove( "QPE/Application/" + name ); | 115 | appl->dict.remove( "QPE/Application/" + name ); |
116 | return FALSE; | 116 | return FALSE; |
117 | } | 117 | } |
118 | return TRUE; | 118 | return TRUE; |
119 | } | 119 | } |
120 | #endif | 120 | #endif |
121 | return FALSE; | 121 | return FALSE; |
122 | } | 122 | } |
123 | 123 | ||
124 | void StartingAppList::handleNewChannel( const QString & name ) | 124 | void StartingAppList::handleNewChannel( const QString & name ) |
125 | { | 125 | { |
126 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 126 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
127 | dict.remove( name ); | 127 | dict.remove( name ); |
128 | #endif | 128 | #endif |
129 | } | 129 | } |
130 | 130 | ||
131 | static bool docDirCreated = FALSE; | 131 | static bool docDirCreated = FALSE; |
132 | static QDawg* fixed_dawg = 0; | 132 | static QDawg* fixed_dawg = 0; |
133 | static QDict<QDawg> *named_dawg = 0; | 133 | static QDict<QDawg> *named_dawg = 0; |
134 | 134 | ||
135 | static QString qpeDir() | 135 | static QString qpeDir() |
136 | { | 136 | { |
137 | QString dir = getenv("QPEDIR"); | 137 | QString dir = getenv("OPIEDIR"); |
138 | if ( dir.isEmpty() ) dir = ".."; | 138 | if ( dir.isEmpty() ) dir = ".."; |
139 | return dir; | 139 | return dir; |
140 | } | 140 | } |
141 | 141 | ||
142 | static QString dictDir() | 142 | static QString dictDir() |
143 | { | 143 | { |
144 | return qpeDir() + "/etc/dict"; | 144 | return qpeDir() + "/etc/dict"; |
145 | } | 145 | } |
146 | 146 | ||
147 | /*! | 147 | /*! |
148 | \class Global global.h | 148 | \class Global global.h |
149 | \brief The Global class collects application-wide global functions. | 149 | \brief The Global class collects application-wide global functions. |
150 | */ | 150 | */ |
151 | 151 | ||
152 | /*! | 152 | /*! |
153 | \internal | 153 | \internal |
154 | */ | 154 | */ |
155 | Global::Global() | 155 | Global::Global() |
156 | { | 156 | { |
157 | } | 157 | } |
158 | 158 | ||
159 | /*! | 159 | /*! |
160 | Returns the unchangeable QDawg that contains general | 160 | Returns the unchangeable QDawg that contains general |
161 | words for the current locale. | 161 | words for the current locale. |
162 | 162 | ||
163 | \sa addedDawg() | 163 | \sa addedDawg() |
164 | */ | 164 | */ |
165 | const QDawg& Global::fixedDawg() | 165 | const QDawg& Global::fixedDawg() |
166 | { | 166 | { |
167 | if ( !fixed_dawg ) { | 167 | if ( !fixed_dawg ) { |
168 | if ( !docDirCreated ) | 168 | if ( !docDirCreated ) |
169 | createDocDir(); | 169 | createDocDir(); |
170 | 170 | ||
171 | fixed_dawg = new QDawg; | 171 | fixed_dawg = new QDawg; |
172 | QString dawgfilename = dictDir() + "/dawg"; | 172 | QString dawgfilename = dictDir() + "/dawg"; |
173 | QString lang = getenv( "LANG" ); | 173 | QString lang = getenv( "LANG" ); |
174 | QString dawgfilename_lang = dawgfilename + "." + lang; | 174 | QString dawgfilename_lang = dawgfilename + "." + lang; |
175 | QString words_lang = dictDir() + "/words." + lang; | 175 | QString words_lang = dictDir() + "/words." + lang; |
176 | if ( QFile::exists(dawgfilename_lang) || | 176 | if ( QFile::exists(dawgfilename_lang) || |
177 | QFile::exists(words_lang) ) | 177 | QFile::exists(words_lang) ) |
178 | dawgfilename = dawgfilename_lang; | 178 | dawgfilename = dawgfilename_lang; |
179 | QFile dawgfile(dawgfilename); | 179 | QFile dawgfile(dawgfilename); |
180 | 180 | ||
181 | if ( !dawgfile.exists() ) { | 181 | if ( !dawgfile.exists() ) { |
182 | QString fn = dictDir() + "/words"; | 182 | QString fn = dictDir() + "/words"; |
183 | if ( QFile::exists(words_lang) ) | 183 | if ( QFile::exists(words_lang) ) |
184 | fn = words_lang; | 184 | fn = words_lang; |
185 | QFile in(fn); | 185 | QFile in(fn); |
186 | if ( in.open(IO_ReadOnly) ) { | 186 | if ( in.open(IO_ReadOnly) ) { |
187 | fixed_dawg->createFromWords(&in); | 187 | fixed_dawg->createFromWords(&in); |
188 | dawgfile.open(IO_WriteOnly); | 188 | dawgfile.open(IO_WriteOnly); |
189 | fixed_dawg->write(&dawgfile); | 189 | fixed_dawg->write(&dawgfile); |
190 | dawgfile.close(); | 190 | dawgfile.close(); |
191 | } | 191 | } |
192 | } else { | 192 | } else { |
193 | fixed_dawg->readFile(dawgfilename); | 193 | fixed_dawg->readFile(dawgfilename); |
194 | } | 194 | } |
195 | } | 195 | } |
196 | 196 | ||
197 | return *fixed_dawg; | 197 | return *fixed_dawg; |
198 | } | 198 | } |
199 | 199 | ||
200 | /*! | 200 | /*! |
201 | Returns the changeable QDawg that contains general | 201 | Returns the changeable QDawg that contains general |
diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -58,75 +58,75 @@ HEADERS = calendar.h \ | |||
58 | lnkproperties.h | 58 | lnkproperties.h |
59 | 59 | ||
60 | SOURCES= calendar.cpp \ | 60 | SOURCES= calendar.cpp \ |
61 | global.cpp \ | 61 | global.cpp \ |
62 | xmlreader.cpp \ | 62 | xmlreader.cpp \ |
63 | mimetype.cpp \ | 63 | mimetype.cpp \ |
64 | menubutton.cpp \ | 64 | menubutton.cpp \ |
65 | network.cpp \ | 65 | network.cpp \ |
66 | networkinterface.cpp \ | 66 | networkinterface.cpp \ |
67 | proxies.cpp \ | 67 | proxies.cpp \ |
68 | filemanager.cpp \ | 68 | filemanager.cpp \ |
69 | fontmanager.cpp \ | 69 | fontmanager.cpp \ |
70 | qdawg.cpp \ | 70 | qdawg.cpp \ |
71 | datebookmonth.cpp \ | 71 | datebookmonth.cpp \ |
72 | fileselector.cpp \ | 72 | fileselector.cpp \ |
73 | imageedit.cpp \ | 73 | imageedit.cpp \ |
74 | resource.cpp \ | 74 | resource.cpp \ |
75 | qpedecoration_qws.cpp \ | 75 | qpedecoration_qws.cpp \ |
76 | qcopenvelope_qws.cpp \ | 76 | qcopenvelope_qws.cpp \ |
77 | qpeapplication.cpp \ | 77 | qpeapplication.cpp \ |
78 | qpestyle.cpp \ | 78 | qpestyle.cpp \ |
79 | qpedialog.cpp \ | 79 | qpedialog.cpp \ |
80 | lightstyle.cpp \ | 80 | lightstyle.cpp \ |
81 | config.cpp \ | 81 | config.cpp \ |
82 | applnk.cpp \ | 82 | applnk.cpp \ |
83 | sound.cpp \ | 83 | sound.cpp \ |
84 | tzselect.cpp \ | 84 | tzselect.cpp \ |
85 | qmath.c \ | 85 | qmath.c \ |
86 | datebookdb.cpp \ | 86 | datebookdb.cpp \ |
87 | alarmserver.cpp \ | 87 | alarmserver.cpp \ |
88 | password.cpp \ | 88 | password.cpp \ |
89 | process.cpp \ | 89 | process.cpp \ |
90 | process_unix.cpp \ | 90 | process_unix.cpp \ |
91 | timestring.cpp \ | 91 | timestring.cpp \ |
92 | fontdatabase.cpp \ | 92 | fontdatabase.cpp \ |
93 | power.cpp \ | 93 | power.cpp \ |
94 | storage.cpp \ | 94 | storage.cpp \ |
95 | qpemessagebox.cpp \ | 95 | qpemessagebox.cpp \ |
96 | backend/timeconversion.cpp \ | 96 | backend/timeconversion.cpp \ |
97 | qpedebug.cpp \ | 97 | qpedebug.cpp \ |
98 | qpemenubar.cpp \ | 98 | qpemenubar.cpp \ |
99 | qpetoolbar.cpp \ | 99 | qpetoolbar.cpp \ |
100 | backend/categories.cpp \ | 100 | backend/categories.cpp \ |
101 | backend/stringutil.cpp \ | 101 | backend/stringutil.cpp \ |
102 | backend/palmtoprecord.cpp \ | 102 | backend/palmtoprecord.cpp \ |
103 | backend/task.cpp \ | 103 | backend/task.cpp \ |
104 | backend/event.cpp \ | 104 | backend/event.cpp \ |
105 | backend/contact.cpp \ | 105 | backend/contact.cpp \ |
106 | categorymenu.cpp \ | 106 | categorymenu.cpp \ |
107 | categoryedit_p.cpp \ | 107 | categoryedit_p.cpp \ |
108 | categoryselect.cpp \ | 108 | categoryselect.cpp \ |
109 | categorywidget.cpp \ | 109 | categorywidget.cpp \ |
110 | ir.cpp \ | 110 | ir.cpp \ |
111 | backend/vcc_yacc.cpp \ | 111 | backend/vcc_yacc.cpp \ |
112 | backend/vobject.cpp \ | 112 | backend/vobject.cpp \ |
113 | findwidget_p.cpp \ | 113 | findwidget_p.cpp \ |
114 | finddialog.cpp \ | 114 | finddialog.cpp \ |
115 | lnkproperties.cpp | 115 | lnkproperties.cpp |
116 | 116 | ||
117 | # Qt 3 compatibility | 117 | # Qt 3 compatibility |
118 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h | 118 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h |
119 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ | 119 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ |
120 | qprocess_unix.cpp | 120 | qprocess_unix.cpp |
121 | 121 | ||
122 | INCLUDEPATH += $(QPEDIR)/include backend | 122 | INCLUDEPATH += $(OPIEDIR)/include backend |
123 | LIBS += -ldl -lcrypt -lm | 123 | LIBS += -ldl -lcrypt -lm |
124 | 124 | ||
125 | INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui | 125 | INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui |
126 | 126 | ||
127 | TARGET = qpe | 127 | TARGET = qpe |
128 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 128 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
129 | # This is set by configure$(QPEDIR). | 129 | # This is set by configure$(OPIEDIR). |
130 | VERSION = 1.5.0 | 130 | VERSION = 1.5.0 |
131 | 131 | ||
132 | TRANSLATIONS = ../i18n/de/libqpe.ts | 132 | TRANSLATIONS = ../i18n/de/libqpe.ts |
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f0a68cf..70ffec1 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -729,133 +729,133 @@ bool QPEApplication::qwsEventFilter( QWSEvent *e ) | |||
729 | } else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) { | 729 | } else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) { |
730 | active->close(); | 730 | active->close(); |
731 | } | 731 | } |
732 | } | 732 | } |
733 | } | 733 | } |
734 | 734 | ||
735 | #if QT_VERSION < 231 | 735 | #if QT_VERSION < 231 |
736 | // Filter out the F4/Launcher key from apps | 736 | // Filter out the F4/Launcher key from apps |
737 | // ### The launcher key may not always be F4 on all devices | 737 | // ### The launcher key may not always be F4 on all devices |
738 | if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 ) | 738 | if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 ) |
739 | return TRUE; | 739 | return TRUE; |
740 | #endif | 740 | #endif |
741 | } | 741 | } |
742 | if ( e->type == QWSEvent::Focus ) { | 742 | if ( e->type == QWSEvent::Focus ) { |
743 | QWSFocusEvent *fe = (QWSFocusEvent*)e; | 743 | QWSFocusEvent *fe = (QWSFocusEvent*)e; |
744 | QWidget* nfw = QWidget::find(e->window()); | 744 | QWidget* nfw = QWidget::find(e->window()); |
745 | if ( !fe->simpleData.get_focus ) { | 745 | if ( !fe->simpleData.get_focus ) { |
746 | QWidget *active = activeWindow(); | 746 | QWidget *active = activeWindow(); |
747 | while ( active && active->isPopup() ) { | 747 | while ( active && active->isPopup() ) { |
748 | active->close(); | 748 | active->close(); |
749 | active = activeWindow(); | 749 | active = activeWindow(); |
750 | } | 750 | } |
751 | if ( !nfw && d->kbgrabber == 2 ) { | 751 | if ( !nfw && d->kbgrabber == 2 ) { |
752 | ungrabKeyboard(); | 752 | ungrabKeyboard(); |
753 | d->kbregrab = TRUE; // want kb back when we're active | 753 | d->kbregrab = TRUE; // want kb back when we're active |
754 | } | 754 | } |
755 | } else { | 755 | } else { |
756 | // make sure our modal widget is ALWAYS on top | 756 | // make sure our modal widget is ALWAYS on top |
757 | QWidget *topm = activeModalWidget(); | 757 | QWidget *topm = activeModalWidget(); |
758 | if ( topm ) { | 758 | if ( topm ) { |
759 | topm->raise(); | 759 | topm->raise(); |
760 | } | 760 | } |
761 | if ( d->kbregrab ) { | 761 | if ( d->kbregrab ) { |
762 | grabKeyboard(); | 762 | grabKeyboard(); |
763 | d->kbregrab = FALSE; | 763 | d->kbregrab = FALSE; |
764 | } | 764 | } |
765 | } | 765 | } |
766 | if ( fe->simpleData.get_focus && inputMethodDict ) { | 766 | if ( fe->simpleData.get_focus && inputMethodDict ) { |
767 | InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); | 767 | InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); |
768 | if ( m == AlwaysOff ) | 768 | if ( m == AlwaysOff ) |
769 | Global::hideInputMethod(); | 769 | Global::hideInputMethod(); |
770 | if ( m == AlwaysOn ) | 770 | if ( m == AlwaysOn ) |
771 | Global::showInputMethod(); | 771 | Global::showInputMethod(); |
772 | } | 772 | } |
773 | } | 773 | } |
774 | return QApplication::qwsEventFilter( e ); | 774 | return QApplication::qwsEventFilter( e ); |
775 | } | 775 | } |
776 | 776 | ||
777 | /*! | 777 | /*! |
778 | Destroys the QPEApplication. | 778 | Destroys the QPEApplication. |
779 | */ | 779 | */ |
780 | QPEApplication::~QPEApplication() | 780 | QPEApplication::~QPEApplication() |
781 | { | 781 | { |
782 | ungrabKeyboard(); | 782 | ungrabKeyboard(); |
783 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 783 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
784 | // Need to delete QCopChannels early, since the display will | 784 | // Need to delete QCopChannels early, since the display will |
785 | // be gone by the time we get to ~QObject(). | 785 | // be gone by the time we get to ~QObject(). |
786 | delete sysChannel; | 786 | delete sysChannel; |
787 | delete pidChannel; | 787 | delete pidChannel; |
788 | #endif | 788 | #endif |
789 | delete d; | 789 | delete d; |
790 | } | 790 | } |
791 | 791 | ||
792 | /*! | 792 | /*! |
793 | Returns <tt>$QPEDIR/</tt>. | 793 | Returns <tt>$OPIEDIR/</tt>. |
794 | */ | 794 | */ |
795 | QString QPEApplication::qpeDir() | 795 | QString QPEApplication::qpeDir() |
796 | { | 796 | { |
797 | const char *base = getenv( "QPEDIR" ); | 797 | const char *base = getenv( "OPIEDIR" ); |
798 | if ( base ) | 798 | if ( base ) |
799 | return QString( base ) + "/"; | 799 | return QString( base ) + "/"; |
800 | 800 | ||
801 | return QString( "../" ); | 801 | return QString( "../" ); |
802 | } | 802 | } |
803 | 803 | ||
804 | /*! | 804 | /*! |
805 | Returns the user's current Document directory. There is a trailing "/". | 805 | Returns the user's current Document directory. There is a trailing "/". |
806 | */ | 806 | */ |
807 | QString QPEApplication::documentDir() | 807 | QString QPEApplication::documentDir() |
808 | { | 808 | { |
809 | const char *base = getenv( "HOME" ); | 809 | const char *base = getenv( "HOME" ); |
810 | if ( base ) | 810 | if ( base ) |
811 | return QString( base ) + "/Documents/"; | 811 | return QString( base ) + "/Documents/"; |
812 | 812 | ||
813 | return QString( "../Documents/" ); | 813 | return QString( "../Documents/" ); |
814 | } | 814 | } |
815 | 815 | ||
816 | static int deforient=-1; | 816 | static int deforient=-1; |
817 | 817 | ||
818 | /*! | 818 | /*! |
819 | \internal | 819 | \internal |
820 | */ | 820 | */ |
821 | int QPEApplication::defaultRotation() | 821 | int QPEApplication::defaultRotation() |
822 | { | 822 | { |
823 | if ( deforient < 0 ) { | 823 | if ( deforient < 0 ) { |
824 | QString d = getenv("QWS_DISPLAY"); | 824 | QString d = getenv("QWS_DISPLAY"); |
825 | if ( d.contains("Rot90") ) { | 825 | if ( d.contains("Rot90") ) { |
826 | deforient = 90; | 826 | deforient = 90; |
827 | } else if ( d.contains("Rot180") ) { | 827 | } else if ( d.contains("Rot180") ) { |
828 | deforient = 180; | 828 | deforient = 180; |
829 | } else if ( d.contains("Rot270") ) { | 829 | } else if ( d.contains("Rot270") ) { |
830 | deforient = 270; | 830 | deforient = 270; |
831 | } else { | 831 | } else { |
832 | deforient=0; | 832 | deforient=0; |
833 | } | 833 | } |
834 | } | 834 | } |
835 | return deforient; | 835 | return deforient; |
836 | } | 836 | } |
837 | 837 | ||
838 | /*! | 838 | /*! |
839 | \internal | 839 | \internal |
840 | */ | 840 | */ |
841 | void QPEApplication::setDefaultRotation(int r) | 841 | void QPEApplication::setDefaultRotation(int r) |
842 | { | 842 | { |
843 | if ( qApp->type() == GuiServer ) { | 843 | if ( qApp->type() == GuiServer ) { |
844 | deforient = r; | 844 | deforient = r; |
845 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1); | 845 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1); |
846 | } else { | 846 | } else { |
847 | QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r; | 847 | QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r; |
848 | } | 848 | } |
849 | } | 849 | } |
850 | 850 | ||
851 | /*! | 851 | /*! |
852 | \internal | 852 | \internal |
853 | */ | 853 | */ |
854 | void QPEApplication::applyStyle() | 854 | void QPEApplication::applyStyle() |
855 | { | 855 | { |
856 | Config config( "qpe" ); | 856 | Config config( "qpe" ); |
857 | 857 | ||
858 | config.setGroup( "Appearance" ); | 858 | config.setGroup( "Appearance" ); |
859 | 859 | ||
860 | // Widget style | 860 | // Widget style |
861 | QString style = config.readEntry( "Style", "Light" ); | 861 | QString style = config.readEntry( "Style", "Light" ); |