author | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
commit | 2802e5a2b474101a50bf95e707061ca5542876fd (patch) (unidiff) | |
tree | a1015514ef9e48df091903cccf0d3174e272f663 /library | |
parent | 48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff) | |
download | opie-2802e5a2b474101a50bf95e707061ca5542876fd.zip opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2 |
*** empty log message ***
-rw-r--r-- | library/Makefile.in | 125 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 10 |
3 files changed, 25 insertions, 112 deletions
diff --git a/library/Makefile.in b/library/Makefile.in index b74b818..b8fc1f6 100644 --- a/library/Makefile.in +++ b/library/Makefile.in | |||
@@ -33,3 +33,2 @@ HEADERS = calendar.h \ | |||
33 | networkinterface.h \ | 33 | networkinterface.h \ |
34 | proxies.h \ | ||
35 | filemanager.h \ | 34 | filemanager.h \ |
@@ -39,2 +38,3 @@ HEADERS = calendar.h \ | |||
39 | fileselector.h \ | 38 | fileselector.h \ |
39 | fileselector_p.h \ | ||
40 | imageedit.h \ | 40 | imageedit.h \ |
@@ -80,8 +80,3 @@ HEADERS = calendar.h \ | |||
80 | finddialog.h \ | 80 | finddialog.h \ |
81 | lnkproperties.h \ | 81 | lnkproperties.h |
82 | quuid.h \ | ||
83 | qcom.h \ | ||
84 | qlibrary.h \ | ||
85 | qlibrary_p.h \ | ||
86 | qprocess.h | ||
87 | SOURCES =calendar.cpp \ | 82 | SOURCES =calendar.cpp \ |
@@ -93,3 +88,2 @@ SOURCES = calendar.cpp \ | |||
93 | networkinterface.cpp \ | 88 | networkinterface.cpp \ |
94 | proxies.cpp \ | ||
95 | filemanager.cpp \ | 89 | filemanager.cpp \ |
@@ -141,8 +135,3 @@ SOURCES = calendar.cpp \ | |||
141 | finddialog.cpp \ | 135 | finddialog.cpp \ |
142 | lnkproperties.cpp \ | 136 | lnkproperties.cpp |
143 | quuid.cpp \ | ||
144 | qlibrary.cpp \ | ||
145 | qlibrary_unix.cpp \ | ||
146 | qprocess.cpp \ | ||
147 | qprocess_unix.cpp | ||
148 | OBJECTS =calendar.o \ | 137 | OBJECTS =calendar.o \ |
@@ -154,3 +143,2 @@ OBJECTS = calendar.o \ | |||
154 | networkinterface.o \ | 143 | networkinterface.o \ |
155 | proxies.o \ | ||
156 | filemanager.o \ | 144 | filemanager.o \ |
@@ -203,9 +191,3 @@ OBJECTS = calendar.o \ | |||
203 | lnkproperties.o \ | 191 | lnkproperties.o \ |
204 | quuid.o \ | ||
205 | qlibrary.o \ | ||
206 | qlibrary_unix.o \ | ||
207 | qprocess.o \ | ||
208 | qprocess_unix.o \ | ||
209 | passwordbase_p.o \ | 192 | passwordbase_p.o \ |
210 | proxiesbase_p.o \ | ||
211 | categoryeditbase_p.o \ | 193 | categoryeditbase_p.o \ |
@@ -214,3 +196,2 @@ OBJECTS = calendar.o \ | |||
214 | INTERFACES = passwordbase_p.ui \ | 196 | INTERFACES = passwordbase_p.ui \ |
215 | proxiesbase_p.ui \ | ||
216 | categoryeditbase_p.ui \ | 197 | categoryeditbase_p.ui \ |
@@ -219,3 +200,2 @@ INTERFACES = passwordbase_p.ui \ | |||
219 | UICDECLS = passwordbase_p.h \ | 200 | UICDECLS = passwordbase_p.h \ |
220 | proxiesbase_p.h \ | ||
221 | categoryeditbase_p.h \ | 201 | categoryeditbase_p.h \ |
@@ -224,3 +204,2 @@ UICDECLS = passwordbase_p.h \ | |||
224 | UICIMPLS = passwordbase_p.cpp \ | 204 | UICIMPLS = passwordbase_p.cpp \ |
225 | proxiesbase_p.cpp \ | ||
226 | categoryeditbase_p.cpp \ | 205 | categoryeditbase_p.cpp \ |
@@ -229,5 +208,5 @@ UICIMPLS = passwordbase_p.cpp \ | |||
229 | SRCMOC =moc_menubutton.cpp \ | 208 | SRCMOC =moc_menubutton.cpp \ |
230 | moc_proxies.cpp \ | ||
231 | moc_datebookmonth.cpp \ | 209 | moc_datebookmonth.cpp \ |
232 | moc_fileselector.cpp \ | 210 | moc_fileselector.cpp \ |
211 | moc_fileselector_p.cpp \ | ||
233 | moc_imageedit.cpp \ | 212 | moc_imageedit.cpp \ |
@@ -249,4 +228,2 @@ SRCMOC = moc_menubutton.cpp \ | |||
249 | moc_lnkproperties.cpp \ | 228 | moc_lnkproperties.cpp \ |
250 | moc_qlibrary_p.cpp \ | ||
251 | moc_qprocess.cpp \ | ||
252 | global.moc \ | 229 | global.moc \ |
@@ -256,5 +233,3 @@ SRCMOC = moc_menubutton.cpp \ | |||
256 | timestring.moc \ | 233 | timestring.moc \ |
257 | qprocess_unix.moc \ | ||
258 | moc_passwordbase_p.cpp \ | 234 | moc_passwordbase_p.cpp \ |
259 | moc_proxiesbase_p.cpp \ | ||
260 | moc_categoryeditbase_p.cpp \ | 235 | moc_categoryeditbase_p.cpp \ |
@@ -263,5 +238,5 @@ SRCMOC = moc_menubutton.cpp \ | |||
263 | OBJMOC =moc_menubutton.o \ | 238 | OBJMOC =moc_menubutton.o \ |
264 | moc_proxies.o \ | ||
265 | moc_datebookmonth.o \ | 239 | moc_datebookmonth.o \ |
266 | moc_fileselector.o \ | 240 | moc_fileselector.o \ |
241 | moc_fileselector_p.o \ | ||
267 | moc_imageedit.o \ | 242 | moc_imageedit.o \ |
@@ -283,6 +258,3 @@ OBJMOC = moc_menubutton.o \ | |||
283 | moc_lnkproperties.o \ | 258 | moc_lnkproperties.o \ |
284 | moc_qlibrary_p.o \ | ||
285 | moc_qprocess.o \ | ||
286 | moc_passwordbase_p.o \ | 259 | moc_passwordbase_p.o \ |
287 | moc_proxiesbase_p.o \ | ||
288 | moc_categoryeditbase_p.o \ | 260 | moc_categoryeditbase_p.o \ |
@@ -321,4 +293,6 @@ moc: $(SRCMOC) | |||
321 | 293 | ||
322 | tmake: | 294 | tmake: Makefile.in |
323 | tmake library.pro | 295 | |
296 | Makefile.in: library.pro | ||
297 | tmake library.pro -o Makefile.in | ||
324 | 298 | ||
@@ -383,7 +357,2 @@ networkinterface.o: networkinterface.cpp \ | |||
383 | 357 | ||
384 | proxies.o: proxies.cpp \ | ||
385 | proxies.h \ | ||
386 | config.h \ | ||
387 | proxiesbase_p.h | ||
388 | |||
389 | filemanager.o: filemanager.cpp \ | 358 | filemanager.o: filemanager.cpp \ |
@@ -412,2 +381,3 @@ fileselector.o: fileselector.cpp \ | |||
412 | applnk.h \ | 381 | applnk.h \ |
382 | fileselector_p.h \ | ||
413 | global.h \ | 383 | global.h \ |
@@ -536,4 +506,3 @@ fontdatabase.o: fontdatabase.cpp \ | |||
536 | power.o: power.cpp \ | 506 | power.o: power.cpp \ |
537 | power.h \ | 507 | power.h |
538 | custom.h | ||
539 | 508 | ||
@@ -635,21 +604,2 @@ lnkproperties.o: lnkproperties.cpp \ | |||
635 | 604 | ||
636 | quuid.o: quuid.cpp \ | ||
637 | quuid.h | ||
638 | |||
639 | qlibrary.o: qlibrary.cpp \ | ||
640 | qlibrary_p.h \ | ||
641 | qlibrary.h | ||
642 | |||
643 | qlibrary_unix.o: qlibrary_unix.cpp \ | ||
644 | qlibrary_p.h \ | ||
645 | qlibrary.h | ||
646 | |||
647 | qprocess.o: qprocess.cpp \ | ||
648 | qprocess.h | ||
649 | |||
650 | qprocess_unix.o: qprocess_unix.cpp \ | ||
651 | qprocess_unix.moc \ | ||
652 | qprocess.h \ | ||
653 | qcleanuphandler_p.h | ||
654 | |||
655 | passwordbase_p.h: passwordbase_p.ui | 605 | passwordbase_p.h: passwordbase_p.ui |
@@ -660,8 +610,2 @@ passwordbase_p.cpp: passwordbase_p.ui | |||
660 | 610 | ||
661 | proxiesbase_p.h: proxiesbase_p.ui | ||
662 | $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h | ||
663 | |||
664 | proxiesbase_p.cpp: proxiesbase_p.ui | ||
665 | $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp | ||
666 | |||
667 | categoryeditbase_p.h: categoryeditbase_p.ui | 611 | categoryeditbase_p.h: categoryeditbase_p.ui |
@@ -686,4 +630,2 @@ passwordbase_p.o: passwordbase_p.cpp | |||
686 | 630 | ||
687 | proxiesbase_p.o: proxiesbase_p.cpp | ||
688 | |||
689 | categoryeditbase_p.o: categoryeditbase_p.cpp | 631 | categoryeditbase_p.o: categoryeditbase_p.cpp |
@@ -697,6 +639,2 @@ moc_menubutton.o: moc_menubutton.cpp \ | |||
697 | 639 | ||
698 | moc_proxies.o: moc_proxies.cpp \ | ||
699 | proxies.h \ | ||
700 | config.h | ||
701 | |||
702 | moc_datebookmonth.o: moc_datebookmonth.cpp \ | 640 | moc_datebookmonth.o: moc_datebookmonth.cpp \ |
@@ -711,2 +649,5 @@ moc_fileselector.o: moc_fileselector.cpp \ | |||
711 | 649 | ||
650 | moc_fileselector_p.o: moc_fileselector_p.cpp \ | ||
651 | fileselector_p.h | ||
652 | |||
712 | moc_imageedit.o: moc_imageedit.cpp \ | 653 | moc_imageedit.o: moc_imageedit.cpp \ |
@@ -768,9 +709,2 @@ moc_lnkproperties.o: moc_lnkproperties.cpp \ | |||
768 | 709 | ||
769 | moc_qlibrary_p.o: moc_qlibrary_p.cpp \ | ||
770 | qlibrary_p.h \ | ||
771 | qlibrary.h | ||
772 | |||
773 | moc_qprocess.o: moc_qprocess.cpp \ | ||
774 | qprocess.h | ||
775 | |||
776 | moc_passwordbase_p.o: global.moc \ | 710 | moc_passwordbase_p.o: global.moc \ |
@@ -778,6 +712,6 @@ moc_passwordbase_p.o: global.moc \ | |||
778 | 712 | ||
779 | moc_proxiesbase_p.o: network.moc \ | 713 | moc_categoryeditbase_p.o: network.moc \ |
780 | network.cpp | 714 | network.cpp |
781 | 715 | ||
782 | moc_categoryeditbase_p.o: password.moc \ | 716 | moc_findwidgetbase_p.o: password.moc \ |
783 | password.cpp \ | 717 | password.cpp \ |
@@ -789,3 +723,3 @@ moc_categoryeditbase_p.o: password.moc \ | |||
789 | 723 | ||
790 | moc_findwidgetbase_p.o: process_unix.moc \ | 724 | moc_lnkpropertiesbase_p.o: process_unix.moc \ |
791 | process_unix.cpp \ | 725 | process_unix.cpp \ |
@@ -793,9 +727,2 @@ moc_findwidgetbase_p.o: process_unix.moc \ | |||
793 | 727 | ||
794 | moc_lnkpropertiesbase_p.o: timestring.moc \ | ||
795 | timestring.cpp \ | ||
796 | timestring.h \ | ||
797 | qpeapplication.h \ | ||
798 | qpedecoration_qws.h \ | ||
799 | config.h | ||
800 | |||
801 | moc_menubutton.cpp: menubutton.h | 728 | moc_menubutton.cpp: menubutton.h |
@@ -803,5 +730,2 @@ moc_menubutton.cpp: menubutton.h | |||
803 | 730 | ||
804 | moc_proxies.cpp: proxies.h | ||
805 | $(MOC) proxies.h -o moc_proxies.cpp | ||
806 | |||
807 | moc_datebookmonth.cpp: datebookmonth.h | 731 | moc_datebookmonth.cpp: datebookmonth.h |
@@ -812,2 +736,5 @@ moc_fileselector.cpp: fileselector.h | |||
812 | 736 | ||
737 | moc_fileselector_p.cpp: fileselector_p.h | ||
738 | $(MOC) fileselector_p.h -o moc_fileselector_p.cpp | ||
739 | |||
813 | moc_imageedit.cpp: imageedit.h | 740 | moc_imageedit.cpp: imageedit.h |
@@ -863,8 +790,2 @@ moc_lnkproperties.cpp: lnkproperties.h | |||
863 | 790 | ||
864 | moc_qlibrary_p.cpp: qlibrary_p.h | ||
865 | $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp | ||
866 | |||
867 | moc_qprocess.cpp: qprocess.h | ||
868 | $(MOC) qprocess.h -o moc_qprocess.cpp | ||
869 | |||
870 | global.moc: global.cpp | 791 | global.moc: global.cpp |
@@ -884,5 +805,2 @@ timestring.moc: timestring.cpp | |||
884 | 805 | ||
885 | qprocess_unix.moc: qprocess_unix.cpp | ||
886 | $(MOC) qprocess_unix.cpp -o qprocess_unix.moc | ||
887 | |||
888 | moc_passwordbase_p.cpp: passwordbase_p.h | 806 | moc_passwordbase_p.cpp: passwordbase_p.h |
@@ -890,5 +808,2 @@ moc_passwordbase_p.cpp: passwordbase_p.h | |||
890 | 808 | ||
891 | moc_proxiesbase_p.cpp: proxiesbase_p.h | ||
892 | $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp | ||
893 | |||
894 | moc_categoryeditbase_p.cpp: categoryeditbase_p.h | 809 | moc_categoryeditbase_p.cpp: categoryeditbase_p.h |
diff --git a/library/global.cpp b/library/global.cpp index e5fc2b3..fd7579a 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -507,3 +507,3 @@ void Global::invoke(const QString &c) | |||
507 | ::execvp( args[0], (char * const *)args ); | 507 | ::execvp( args[0], (char * const *)args ); |
508 | exit( -1 ); | 508 | _exit( -1 ); |
509 | } | 509 | } |
diff --git a/library/library.pro b/library/library.pro index 058d216..e71e5a0 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -10,3 +10,2 @@ HEADERS = calendar.h \ | |||
10 | networkinterface.h \ | 10 | networkinterface.h \ |
11 | proxies.h \ | ||
12 | filemanager.h \ | 11 | filemanager.h \ |
@@ -16,2 +15,3 @@ HEADERS = calendar.h \ | |||
16 | fileselector.h \ | 15 | fileselector.h \ |
16 | fileselector_p.h \ | ||
17 | imageedit.h \ | 17 | imageedit.h \ |
@@ -66,3 +66,2 @@ SOURCES = calendar.cpp \ | |||
66 | networkinterface.cpp \ | 66 | networkinterface.cpp \ |
67 | proxies.cpp \ | ||
68 | filemanager.cpp \ | 67 | filemanager.cpp \ |
@@ -117,5 +116,4 @@ SOURCES = calendar.cpp \ | |||
117 | # Qt 3 compatibility | 116 | # Qt 3 compatibility |
118 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h | 117 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h |
119 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ | 118 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp |
120 | qprocess_unix.cpp | ||
121 | 119 | ||
@@ -124,3 +122,3 @@ LIBS += -ldl -lcrypt -lm | |||
124 | 122 | ||
125 | INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui | 123 | INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui |
126 | 124 | ||