summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-29 14:16:05 (UTC)
committer zautrix <zautrix>2004-08-29 14:16:05 (UTC)
commit3a5648d8378b44cbe12d66bafa3d557c065f0f6d (patch) (side-by-side diff)
tree1f143371c48b017ee6cf86862fcbc261727421b4
parentf7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (diff)
downloadkdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.zip
kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.gz
kdepimpi-3a5648d8378b44cbe12d66bafa3d557c065f0f6d.tar.bz2
Some compilation fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile6
-rw-r--r--kabc/kabc.pro2
-rw-r--r--korganizer/kdatenavigator.cpp7
-rw-r--r--korganizer/koeditorrecurrence.cpp2
-rw-r--r--libkcal/calendar.h4
5 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 95a3a45..ac314b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Thu Aug 19 22:23:29 2004
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 13:39:55 2004
# Project: kopi-desktop.pro
# Template: subdirs
# Command: $(QMAKE) -o Makefile kopi-desktop.pro
@@ -11,8 +11,6 @@ QMAKE = qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
-INSTALL_FILE=
-INSTALL_DIR =
SUBTARGETS = \
sub-gammu-emb-common \
sub-libical \
@@ -89,7 +87,7 @@ kabc/plugins/dir/$(MAKEFILE):
sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf
+Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf
$(QMAKE) -o Makefile kopi-desktop.pro
qmake: qmake_all
@$(QMAKE) -o Makefile kopi-desktop.pro
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 95ebd68..417f5b0 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -81,7 +81,6 @@ vcard/include/VCardPhoneNumberValue.h \
vcard/include/VCardSourceParam.h \
vcard/include/VCardTelParam.h \
vcard/include/VCardTextParam.h \
-vcard/include/VCardTextNSParam.h \
vcard/include/VCardTextValue.h \
vcard/include/VCardTextBinParam.h \
vcard/include/VCardURIValue.h \
@@ -137,6 +136,7 @@ vcard/include/generated/TextListValue-generated.h
# plugins/ldap/resourceldapconfig.h \
#formats/binary/binaryformat.h \
+#vcard/include/VCardTextNSParam.h \
SOURCES = \
distributionlist.cpp \
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 7d0c516..b420351 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -249,10 +249,13 @@ void KDateNavigator::updateView()
//ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear();
int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4)));
+ int add = 0;
+ if ( ! KGlobal::locale()->weekStartsMonday() )
+ ++add;
if (dayOfYear % 7 != 0)
- weeknum.setNum(dayOfYear / 7 + 1);
+ weeknum.setNum(dayOfYear / 7 + 1+add);
else
- weeknum.setNum(dayOfYear / 7);
+ weeknum.setNum(dayOfYear / 7 +add);
weeknos[i]->setText(weeknum);
}
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 584d1ed..4209e10 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -1052,7 +1052,7 @@ void KOEditorRecurrence::writeEvent( Event *event )
}
if ( !found ) {
days.setBit( event->dtStart().date().dayOfWeek()-1);
- qDebug("bit set %d ");
+ qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
}
if ( duration != 0 ) r->setWeekly( freq, days, duration );
else r->setWeekly( freq, days, endDate );
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 06a911c..c45d81f 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -32,14 +32,14 @@
#include "event.h"
#include "todo.h"
#include "journal.h"
+#include "calfilter.h"
-#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
+//#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
class KConfig;
namespace KCal {
-class CalFilter;
/**
This is the main "calendar" object class for KOrganizer. It holds