-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 042046e..0db8e6d 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -8,48 +8,49 @@ | |||
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #ifndef _WIN32_ | 25 | #ifndef _WIN32_ |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #endif | 27 | #endif |
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
30 | #include <qtextcodec.h> | 30 | #include <qtextcodec.h> |
31 | #include <qstring.h> | 31 | #include <qstring.h> |
32 | #include <qregexp.h> | ||
32 | #include <qfont.h> | 33 | #include <qfont.h> |
33 | #include <qcolor.h> | 34 | #include <qcolor.h> |
34 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
35 | #include <stdlib.h> | 36 | #include <stdlib.h> |
36 | 37 | ||
37 | #include <kglobal.h> | 38 | #include <kglobal.h> |
38 | #include <kconfig.h> | 39 | #include <kconfig.h> |
39 | #include <klocale.h> | 40 | #include <klocale.h> |
40 | #include <kdebug.h> | 41 | #include <kdebug.h> |
41 | #include <kemailsettings.h> | 42 | #include <kemailsettings.h> |
42 | #include <kstaticdeleter.h> | 43 | #include <kstaticdeleter.h> |
43 | 44 | ||
44 | #include "koprefs.h" | 45 | #include "koprefs.h" |
45 | #include "mainwindow.h" | 46 | #include "mainwindow.h" |
46 | 47 | ||
47 | const char *germanwords[][2] = { | 48 | const char *germanwords[][2] = { |
48 | #include "wordsgerman.h" | 49 | #include "wordsgerman.h" |
49 | "", "" | 50 | "", "" |
50 | }; | 51 | }; |
51 | 52 | ||
52 | KOPrefs *KOPrefs::mInstance = 0; | 53 | KOPrefs *KOPrefs::mInstance = 0; |
53 | static KStaticDeleter<KOPrefs> insd; | 54 | static KStaticDeleter<KOPrefs> insd; |
54 | 55 | ||
55 | KOPrefs::KOPrefs() : | 56 | KOPrefs::KOPrefs() : |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 02e608c..e501d88 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -1,45 +1,49 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = _obj/ | 4 | OBJECTS_DIR = _obj/ |
5 | MOC_DIR = _moc | 5 | MOC_DIR = _moc |
6 | DESTDIR= ../bin | 6 | DESTDIR= ../bin |
7 | 7 | ||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio | 10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC | 14 | #KORG_NOPRINTER KORG_NOKABC |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | LIBS += ../bin/libmicrokdepim.so | 18 | LIBS += ../bin/libmicrokdepim.so |
19 | LIBS += ../bin/libmicrokcal.so | 19 | LIBS += ../bin/libmicrokcal.so |
20 | LIBS += ../bin/libmicrokde.so | 20 | LIBS += ../bin/libmicrokde.so |
21 | LIBS += ../bin/libmicrokabc.so | 21 | LIBS += ../bin/libmicrokabc.so |
22 | LIBS += ../bin/libmicrogammu.so | ||
23 | LIBS += -lbluetooth | ||
24 | LIBS += -lsdp | ||
25 | |||
22 | LIBS += -lldap | 26 | LIBS += -lldap |
23 | OBJECTS_DIR = obj/unix | 27 | OBJECTS_DIR = obj/unix |
24 | MOC_DIR = moc/unix | 28 | MOC_DIR = moc/unix |
25 | } | 29 | } |
26 | win32: { | 30 | win32: { |
27 | DEFINES += _WIN32_ | 31 | DEFINES += _WIN32_ |
28 | LIBS += ../bin/microkdepim.lib | 32 | LIBS += ../bin/microkdepim.lib |
29 | LIBS += ../bin/microkcal.lib | 33 | LIBS += ../bin/microkcal.lib |
30 | LIBS += ../bin/microkde.lib | 34 | LIBS += ../bin/microkde.lib |
31 | LIBS += ../bin/microkabc.lib | 35 | LIBS += ../bin/microkabc.lib |
32 | LIBS += ../libical/lib/ical.lib | 36 | LIBS += ../libical/lib/ical.lib |
33 | LIBS += ../libical/lib/icalss.lib | 37 | LIBS += ../libical/lib/icalss.lib |
34 | #LIBS += atls.lib | 38 | #LIBS += atls.lib |
35 | LIBS += mfc71u.lib | 39 | LIBS += mfc71u.lib |
36 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 40 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
37 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 41 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
38 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 42 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
39 | OBJECTS_DIR = obj/win | 43 | OBJECTS_DIR = obj/win |
40 | MOC_DIR = moc/win | 44 | MOC_DIR = moc/win |
41 | } | 45 | } |
42 | 46 | ||
43 | 47 | ||
44 | INTERFACES = kofilterview_base.ui | 48 | INTERFACES = kofilterview_base.ui |
45 | # filteredit_base.ui | 49 | # filteredit_base.ui |