remove merge conflict

1 files changed, 14 insertions, 14 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index f4008e9..4d64099 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -14,35 +14,24 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#include <qmessagebox.h>
 
 #include "datebookday.h"
 #include "datebookdayheaderimpl.h"
 #include "datebookdayallday.h"
 
-#include <qpe/datebookdb.h>
 #include <qpe/resource.h>
-#include <qpe/event.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/timestring.h>
-#include <qpe/qpedebug.h>
 #include <qpe/ir.h>
 
-#include <qheader.h>
-#include <qdatetime.h>
-#include <qpainter.h>
 #include <qsimplerichtext.h>
 #include <qpopupmenu.h>
-#include <qtextcodec.h>
-#include <qpalette.h>
 
-#include <qlineedit.h>
 
 #include <qtimer.h>
 
 DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *name )
     : QTable( 24, 1, parent, name ), ampm( whichClock ), currDate( QDate::currentDate() )
 {
@@ -50,13 +39,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *
 	setTopMargin( 0 );
 	horizontalHeader()->hide();
 	setLeftMargin(38);
 	setColumnStretchable( 0, TRUE );
 	setHScrollBarMode( QScrollView::AlwaysOff );
 	verticalHeader()->setPalette(white);
-	verticalHeader()->setResizeEnabled(FALSE);
+ 	verticalHeader()->setResizeEnabled(FALSE);
 	setSelectionMode( Single );
 
 	// get rid of being able to edit things...
 	QTableItem *tmp;
 	int row;
 	for ( row = 0; row < numRows(); row++ ) {
@@ -69,12 +58,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *
 	QObject::connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotChangeClock(bool)) );
 }
 
 void DateBookDayView::initHeader()
 {
 	QString strTmp;
+	int preferredWidth = 0;
 	for ( int i = 0; i < 24; ++i ) {
 		if ( ampm ) {
 			if ( i == 0 )
 			strTmp = QString::number(12) + ":00";
 			else if ( i == 12 )
 			strTmp = QString::number(12) + tr(":00p");
@@ -87,14 +77,24 @@ void DateBookDayView::initHeader()
 			strTmp = "0" + QString::number(i) + ":00";
 			else
 			strTmp = QString::number(i) + ":00";
 		}
 		strTmp = strTmp.rightJustify( 6, ' ' );
 		verticalHeader()->setLabel( i, strTmp );
+
+		// Compute correct width for current Font (Add some space right)
+		int actWidth = QFontMetrics( QFont::defaultFont() ).width( strTmp + QString("  ") );
+		if ( preferredWidth < actWidth )
+			preferredWidth = actWidth;
 		setRowStretchable( i, FALSE );
 	}
+
+	// It seems as if the header has a bug. It does not resize
+	// correct horizontally if it is used vertical..
+	// Thus, we do it manually..
+	setLeftMargin( preferredWidth );
 }
 
 void DateBookDayView::slotDateChanged( int y, int m, int d )
 {
 	currDate.setYMD(y,m,d);
 }
@@ -170,13 +170,13 @@ void DateBookDayView::setRowStyle( int style )
 	if (style<0) style = 0;
 
 	for (int i=0; i<numRows(); i++)
 		setRowHeight(i, style*10+20);
 }
 
-void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent *e )
+void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent* /* e */ )
 {
 	int sh=99,eh=-1;
 
 	for(int i=0;i<this->numSelections();i++) {
 		QTableSelection sel = this->selection( i );
 		sh = QMIN(sh,sel.topRow());
@@ -216,13 +216,13 @@ void DateBookDayViewQuickLineEdit::slotReturnPressed()
 	QTimer::singleShot(500, this, SLOT(finallyCallClose())  );	// Close and also delete this widget
 }
 void DateBookDayViewQuickLineEdit::finallyCallClose() {
     close(true); // also deletes this widget...
 }
 
-void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent * e )
+void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */)
 {
 	slotReturnPressed(); // Reuse code to add event and close this widget.
 }
 
 //===========================================================================