author | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-29 14:16:05 (UTC) |
commit | 3a5648d8378b44cbe12d66bafa3d557c065f0f6d (patch) (unidiff) | |
tree | 1f143371c48b017ee6cf86862fcbc261727421b4 | |
parent | f7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (diff) | |
download | kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.zip kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.gz kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.bz2 |
Some compilation fixes
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | kabc/kabc.pro | 2 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 | ||||
-rw-r--r-- | libkcal/calendar.h | 4 |
5 files changed, 11 insertions, 10 deletions
@@ -1,7 +1,7 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | # Makefile for building: kopi-desktop | 2 | # Makefile for building: kopi-desktop |
3 | # Generated by qmake (1.07a) (Qt 3.3.3) on: Thu Aug 19 22:23:29 2004 | 3 | # Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 13:39:55 2004 |
4 | # Project: kopi-desktop.pro | 4 | # Project: kopi-desktop.pro |
5 | # Template: subdirs | 5 | # Template: subdirs |
6 | # Command: $(QMAKE) -o Makefile kopi-desktop.pro | 6 | # Command: $(QMAKE) -o Makefile kopi-desktop.pro |
7 | ############################################################################# | 7 | ############################################################################# |
@@ -10,10 +10,8 @@ MAKEFILE = Makefile | |||
10 | QMAKE =qmake | 10 | QMAKE =qmake |
11 | DEL_FILE = rm -f | 11 | DEL_FILE = rm -f |
12 | CHK_DIR_EXISTS= test -d | 12 | CHK_DIR_EXISTS= test -d |
13 | MKDIR = mkdir -p | 13 | MKDIR = mkdir -p |
14 | INSTALL_FILE= | ||
15 | INSTALL_DIR = | ||
16 | SUBTARGETS = \ | 14 | SUBTARGETS = \ |
17 | sub-gammu-emb-common \ | 15 | sub-gammu-emb-common \ |
18 | sub-libical \ | 16 | sub-libical \ |
19 | sub-libkcal \ | 17 | sub-libkcal \ |
@@ -88,9 +86,9 @@ kabc/plugins/dir/$(MAKEFILE): | |||
88 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) | 86 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) |
89 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | 87 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE |
90 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) | 88 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) |
91 | 89 | ||
92 | Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf | 90 | Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf |
93 | $(QMAKE) -o Makefile kopi-desktop.pro | 91 | $(QMAKE) -o Makefile kopi-desktop.pro |
94 | qmake: qmake_all | 92 | qmake: qmake_all |
95 | @$(QMAKE) -o Makefile kopi-desktop.pro | 93 | @$(QMAKE) -o Makefile kopi-desktop.pro |
96 | 94 | ||
diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..417f5b0 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro | |||
@@ -80,9 +80,8 @@ vcard/include/VCardParam.h \ | |||
80 | vcard/include/VCardPhoneNumberValue.h \ | 80 | vcard/include/VCardPhoneNumberValue.h \ |
81 | vcard/include/VCardSourceParam.h \ | 81 | vcard/include/VCardSourceParam.h \ |
82 | vcard/include/VCardTelParam.h \ | 82 | vcard/include/VCardTelParam.h \ |
83 | vcard/include/VCardTextParam.h \ | 83 | vcard/include/VCardTextParam.h \ |
84 | vcard/include/VCardTextNSParam.h \ | ||
85 | vcard/include/VCardTextValue.h \ | 84 | vcard/include/VCardTextValue.h \ |
86 | vcard/include/VCardTextBinParam.h \ | 85 | vcard/include/VCardTextBinParam.h \ |
87 | vcard/include/VCardURIValue.h \ | 86 | vcard/include/VCardURIValue.h \ |
88 | vcard/include/VCardVCard.h \ | 87 | vcard/include/VCardVCard.h \ |
@@ -136,8 +135,9 @@ vcard/include/generated/TextListValue-generated.h | |||
136 | # plugins/ldap/resourceldap.h \ | 135 | # plugins/ldap/resourceldap.h \ |
137 | # plugins/ldap/resourceldapconfig.h \ | 136 | # plugins/ldap/resourceldapconfig.h \ |
138 | #formats/binary/binaryformat.h \ | 137 | #formats/binary/binaryformat.h \ |
139 | 138 | ||
139 | #vcard/include/VCardTextNSParam.h \ | ||
140 | 140 | ||
141 | SOURCES = \ | 141 | SOURCES = \ |
142 | distributionlist.cpp \ | 142 | distributionlist.cpp \ |
143 | distributionlistdialog.cpp \ | 143 | distributionlistdialog.cpp \ |
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -248,12 +248,15 @@ void KDateNavigator::updateView() | |||
248 | 248 | ||
249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); | 249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); |
250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); | 250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); |
251 | 251 | ||
252 | int add = 0; | ||
253 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
254 | ++add; | ||
252 | if (dayOfYear % 7 != 0) | 255 | if (dayOfYear % 7 != 0) |
253 | weeknum.setNum(dayOfYear / 7 + 1); | 256 | weeknum.setNum(dayOfYear / 7 + 1+add); |
254 | else | 257 | else |
255 | weeknum.setNum(dayOfYear / 7); | 258 | weeknum.setNum(dayOfYear / 7 +add); |
256 | weeknos[i]->setText(weeknum); | 259 | weeknos[i]->setText(weeknum); |
257 | } | 260 | } |
258 | 261 | ||
259 | setUpdatesEnabled( true ); | 262 | setUpdatesEnabled( true ); |
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -1051,9 +1051,9 @@ void KOEditorRecurrence::writeEvent( Event *event ) | |||
1051 | found |=days.at(j); | 1051 | found |=days.at(j); |
1052 | } | 1052 | } |
1053 | if ( !found ) { | 1053 | if ( !found ) { |
1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); | 1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); |
1055 | qDebug("bit set %d "); | 1055 | qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); |
1056 | } | 1056 | } |
1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); | 1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); |
1058 | else r->setWeekly( freq, days, endDate ); | 1058 | else r->setWeekly( freq, days, endDate ); |
1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { | 1059 | } else if ( recurrenceType == RecurrenceChooser::Monthly ) { |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 06a911c..c45d81f 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -31,16 +31,16 @@ | |||
31 | #include "customproperties.h" | 31 | #include "customproperties.h" |
32 | #include "event.h" | 32 | #include "event.h" |
33 | #include "todo.h" | 33 | #include "todo.h" |
34 | #include "journal.h" | 34 | #include "journal.h" |
35 | #include "calfilter.h" | ||
35 | 36 | ||
36 | #define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ | 37 | //#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ |
37 | 38 | ||
38 | class KConfig; | 39 | class KConfig; |
39 | 40 | ||
40 | namespace KCal { | 41 | namespace KCal { |
41 | 42 | ||
42 | class CalFilter; | ||
43 | 43 | ||
44 | /** | 44 | /** |
45 | This is the main "calendar" object class for KOrganizer. It holds | 45 | This is the main "calendar" object class for KOrganizer. It holds |
46 | information like all appointments/events, user information, etc. etc. | 46 | information like all appointments/events, user information, etc. etc. |