summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp3
-rw-r--r--korganizer/kdatenavigator.cpp2
-rw-r--r--korganizer/kodaymatrix.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 5941337..d4173e8 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -160,7 +160,8 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl;
kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl;
#endif
- QSize minSize = mNavigatorView->sizeHintTwoButtons();
+ //QSize minSize = mNavigatorView->sizeHintTwoButtons();
+ QSize minSize = mNavigatorView->yourSizeHint();
// kdDebug(5850) << " NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index a5dbc5d..4b50b5a 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -115,7 +115,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
// read settings from configuration file.
updateConfig();
enableRollover(FollowMonth);
- mySizeHint = sizeHint();
+ mySizeHint = sizeHintTwoButtons();
mFontChanged = false;
}
void KDateNavigator::changeFont ( QFont fo )
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 582b2ef..9baff20 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -445,7 +445,7 @@ void KODayMatrix::updateEvents()
const QDate& KODayMatrix::getDate(int offset)
{
if (offset < 0 || offset > NUMDAYS-1) {
- qDebug("Wrong offset2 ");
+ qDebug("Wrong offset2 %d", offset);
return days[0];
}
return days[offset];
@@ -454,8 +454,8 @@ const QDate& KODayMatrix::getDate(int offset)
QString KODayMatrix::getHolidayLabel(int offset)
{
if (offset < 0 || offset > NUMDAYS-1) {
- qDebug("Wrong offset1 ");
- return 0;
+ qDebug("Wrong offset1 %d", offset);
+ return QString();
}
return mHolidays[offset];
}