summaryrefslogtreecommitdiff
path: root/library
authorkergoth <kergoth>2002-01-28 23:28:04 (UTC)
committer kergoth <kergoth>2002-01-28 23:28:04 (UTC)
commitf7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (unidiff)
tree44f49bdc076dc299bba1a4dc8d5d517114be5701 /library
parent77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff)
downloadopie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2
Committing in .
Modified Files: configure mkipks addressbook/Makefile.in addressbook/addressbook.pro calc2/calc.pro calc2/binary/binary.pro calc2/simple/simple.pro calculator/Makefile.in calculator/calculator.pro cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro citytime/Makefile.in citytime/citytime.pro clock/Makefile.in clock/clock.pro datebook/Makefile.in datebook/datebook.pro dictionary/dictionary.pro doc/qcop.doc doc/start.doc embeddedkonsole/Makefile.in embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe example/example.pro fifteen/Makefile.in fifteen/fifteen.pro filebrowser/Makefile.in filebrowser/filebrowser.pro freetype/freetype.pro go/Makefile.in go/go.pro helpbrowser/Makefile.in helpbrowser/helpbrowser.pro inputmethods/handwriting/Makefile.in inputmethods/handwriting/handwriting.pro inputmethods/keyboard/Makefile.in inputmethods/keyboard/keyboard.pro inputmethods/pickboard/Makefile.in inputmethods/pickboard/pickboard.pro inputmethods/unikeyboard/Makefile.in inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in keypebble/keypebble.pro library/Makefile.in library/global.cpp library/library.pro library/qpeapplication.cpp mindbreaker/Makefile.in mindbreaker/mindbreaker.pro minesweep/Makefile.in minesweep/minesweep.pro mpegplayer/Makefile.in mpegplayer/mpegplayer.pro mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in mpegplayer/libmpeg3/libmpeg3.pro mpegplayer/libmpeg3/audio/Makefile mpegplayer/libmpeg3/video/Makefile mpegplayer/wavplugin/Makefile.in mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in netsetup/README netsetup/netsetup.pro netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro netsetup/lan/Makefile.in netsetup/lan/lan.pro parashoot/Makefile.in parashoot/parashoot.pro qasteroids/Makefile.in qasteroids/qasteroids.pro qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in qipkg/qipkg.pro scripts/q_functions settings/appearance/Makefile.in settings/appearance/appearance.pro settings/language/Makefile.in settings/language/language.pro settings/light-and-power/Makefile.in settings/light-and-power/light-and-power.pro settings/rotation/Makefile.in settings/rotation/rotation.pro settings/security/Makefile.in settings/security/security.pro settings/sound/Makefile.in settings/sound/sound.pro settings/systemtime/Makefile.in settings/systemtime/systemtime.pro showimg/Makefile.in showimg/showimg.pro single/Makefile.in single/single.pro snake/Makefile.in snake/snake.pro solitaire/Makefile.in solitaire/solitaire.pro spreadsheet/Makefile.in spreadsheet/spreadsheet.pro sysinfo/Makefile.in sysinfo/sysinfo.pro tableviewer/tableviewer.pro taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro taskbar/batteryapplet/Makefile.in taskbar/batteryapplet/batteryapplet.pro taskbar/clipboardapplet/clipboardapplet.pro taskbar/clockapplet/Makefile.in taskbar/clockapplet/clockapplet.pro taskbar/netmonapplet/Makefile.in taskbar/netmonapplet/netmonapplet.pro taskbar/volumeapplet/Makefile.in taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro website/htdocs/build.html website/htdocs/development.html website/htdocs/refman/qcop.html website/htdocs/refman/qpeapplication.html wordgame/Makefile.in wordgame/wordgame.pro Log Message: Changed QPEDIR to OPIEDIR in .pro files, and documentation, and regenerated all Makefile.in's that were affected.
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/Makefile.in26
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro4
-rw-r--r--library/qpeapplication.cpp4
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
17DESTDIR = $(QTDIR)/lib$(PROJMAK)/ 17DESTDIR = $(QTDIR)/lib$(PROJMAK)/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 5 19VER_MIN = 5
20VER_PATCH = 0 20VER_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
462qpestyle.o: qpestyle.cpp \ 463qpestyle.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
468qpedialog.o: qpedialog.cpp \ 469qpedialog.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
528fontdatabase.o: fontdatabase.cpp \ 529fontdatabase.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
535power.o: power.cpp \ 536power.o: power.cpp \
536 power.h 537 power.h \
538 custom.h
537 539
538storage.o: storage.cpp 540storage.o: storage.cpp
539 541
540qpemessagebox.o: qpemessagebox.cpp \ 542qpemessagebox.o: qpemessagebox.cpp \
541 qpemessagebox.h 543 qpemessagebox.h
542 544
543backend/timeconversion.o: backend/timeconversion.cpp \ 545backend/timeconversion.o: backend/timeconversion.cpp \
544 backend/timeconversion.h 546 backend/timeconversion.h
545 547
546qpedebug.o: qpedebug.cpp \ 548qpedebug.o: qpedebug.cpp \
547 qpedebug.h 549 qpedebug.h
548 550
@@ -601,25 +603,26 @@ categoryselect.o: categoryselect.cpp \
601 603
602categorywidget.o: categorywidget.cpp \ 604categorywidget.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
607ir.o: ir.cpp \ 609ir.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
612backend/vcc_yacc.o: backend/vcc_yacc.cpp \ 614backend/vcc_yacc.o: backend/vcc_yacc.cpp \
613 backend/vobject_p.h 615 backend/vobject_p.h \
616 backend/qfiledirect_p.h
614 617
615backend/vobject.o: backend/vobject.cpp \ 618backend/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
619findwidget_p.o: findwidget_p.cpp \ 622findwidget_p.o: findwidget_p.cpp \
620 findwidget_p.h \ 623 findwidget_p.h \
621 findwidgetbase_p.h 624 findwidgetbase_p.h
622 625
623finddialog.o: finddialog.cpp \ 626finddialog.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
670findwidgetbase_p.h: findwidgetbase_p.ui 673findwidgetbase_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
673findwidgetbase_p.cpp: findwidgetbase_p.ui 676findwidgetbase_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
676lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui 679lnkpropertiesbase_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
679lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui 682lnkpropertiesbase_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
682passwordbase_p.o: passwordbase_p.cpp \ 685passwordbase_p.o: passwordbase_p.cpp
683 passwordbase_p.h
684 686
685proxiesbase_p.o: proxiesbase_p.cpp \ 687proxiesbase_p.o: proxiesbase_p.cpp
686 proxiesbase_p.h
687 688
688categoryeditbase_p.o: categoryeditbase_p.cpp \ 689categoryeditbase_p.o: categoryeditbase_p.cpp
689 categoryeditbase_p.h
690 690
691findwidgetbase_p.o: findwidgetbase_p.cpp \ 691findwidgetbase_p.o: findwidgetbase_p.cpp
692 findwidgetbase_p.h
693 692
694lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ 693lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
695 lnkpropertiesbase_p.h
696 694
697moc_menubutton.o: moc_menubutton.cpp \ 695moc_menubutton.o: moc_menubutton.cpp \
698 menubutton.h 696 menubutton.h
699 697
700moc_proxies.o: moc_proxies.cpp \ 698moc_proxies.o: moc_proxies.cpp \
701 proxies.h \ 699 proxies.h \
702 config.h 700 config.h
703 701
704moc_datebookmonth.o: moc_datebookmonth.cpp \ 702moc_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
131static bool docDirCreated = FALSE; 131static bool docDirCreated = FALSE;
132static QDawg* fixed_dawg = 0; 132static QDawg* fixed_dawg = 0;
133static QDict<QDawg> *named_dawg = 0; 133static QDict<QDawg> *named_dawg = 0;
134 134
135static QString qpeDir() 135static 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
142static QString dictDir() 142static 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
118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h 118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ 119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
120 qprocess_unix.cpp 120 qprocess_unix.cpp
121 121
122INCLUDEPATH += $(QPEDIR)/include backend 122INCLUDEPATH += $(OPIEDIR)/include backend
123 LIBS += -ldl -lcrypt -lm 123 LIBS += -ldl -lcrypt -lm
124 124
125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 125INTERFACES = 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
132TRANSLATIONS = ../i18n/de/libqpe.ts 132TRANSLATIONS = ../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*/
795QString QPEApplication::qpeDir() 795QString 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*/
807QString QPEApplication::documentDir() 807QString QPEApplication::documentDir()
808{ 808{
809 const char *base = getenv( "HOME" ); 809 const char *base = getenv( "HOME" );