-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,21 +1,21 @@ | |||
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 |
@@ -448,25 +448,26 @@ qpeapplication.o: qpeapplication.cpp \ | |||
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 |
@@ -524,25 +525,26 @@ timestring.o: timestring.cpp \ | |||
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 | ||
@@ -601,25 +603,26 @@ categoryselect.o: categoryselect.cpp \ | |||
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 \ |
@@ -670,38 +673,33 @@ categoryeditbase_p.cpp: categoryeditbase_p.ui | |||
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 |
diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -125,25 +125,25 @@ 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. |
diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -110,23 +110,23 @@ SOURCES = calendar.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 | |||
@@ -781,29 +781,29 @@ 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" ); |