[ #12470 ] Fix new history item ordering

kde/src/widgets/BookmarkDock.cpp

@@ -48,7 +48,7 @@
 class QNumericTreeWidgetItem : public QTreeWidgetItem {
    public:
       QNumericTreeWidgetItem(QTreeWidget* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
-      QNumericTreeWidgetItem(QTreeWidgetItem* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
+      QNumericTreeWidgetItem(QTreeWidgetItem* parent=0):QTreeWidgetItem(parent),widget(0),weight(-1){}
       HistoryTreeItem* widget;
       int weight;
    private:

kde/src/widgets/CategorizedTreeWidget.h

@@ -39,7 +39,7 @@ class CategorizedTreeWidget : public QTreeWidget
     explicit CategorizedTreeWidget(QWidget *parent = 0);
 
   public:
-    template <class T = QTreeWidgetItem> T* addItem(QString category);
+    template <class T = QTreeWidgetItem> T* addItem(QString category,bool top = false);
     template <class T = QTreeWidgetItem> T* addCategory(QString name);
     void removeItem(QTreeWidgetItem* item);
     
@@ -54,7 +54,7 @@ class CategorizedTreeWidget : public QTreeWidget
     QVector<QTreeWidgetItem*> m_lItems;
 };
 
-template <class T> T* CategorizedTreeWidget::addItem(QString category)
+template <class T> T* CategorizedTreeWidget::addItem(QString category,bool top)
 {
   QTreeWidgetItem* categoryItem = 0;
   for (int i = 0; i < topLevelItemCount(); ++i) {
@@ -69,8 +69,10 @@ template <class T> T* CategorizedTreeWidget::addItem(QString category)
   }
   setItemHidden(categoryItem,false);
 
-  T* iwdg =  new T(categoryItem);
+  T* iwdg =  new T((top)?0:categoryItem);
   resizeColumnToContents(0);
+   if (top)
+      categoryItem->insertChild(0,iwdg);
   m_lItems << iwdg;
   return iwdg;
 }

kde/src/widgets/ContactDock.cpp

@@ -59,7 +59,7 @@
 class QNumericTreeWidgetItem_hist : public QTreeWidgetItem {
    public:
       QNumericTreeWidgetItem_hist(QTreeWidget* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
-      QNumericTreeWidgetItem_hist(QTreeWidgetItem* parent):QTreeWidgetItem(parent),widget(0),weight(-1){}
+      QNumericTreeWidgetItem_hist(QTreeWidgetItem* parent=0):QTreeWidgetItem(parent),widget(0),weight(-1){}
       ContactItemWidget* widget;
       QString number;
       int weight;

kde/src/widgets/ContactItemWidget.cpp

@@ -118,7 +118,6 @@ ContactItemWidget::~ContactItemWidget()
    if (m_pOrganizationL) delete m_pOrganizationL;
    if (m_pEmailL)        delete m_pEmailL       ;
    if (m_pMenu)          delete m_pMenu         ;
-//    delete m_pItem         ;
 
    delete m_pCallAgain   ;
    delete m_pEditContact ;

kde/src/widgets/HistoryDock.cpp

@@ -267,7 +267,7 @@ void HistoryDock::newHistoryCall(Call* call)
    switch (CURRENT_SORTING_MODE) {
       case Date: {
          QString category = timeToHistoryCategory(QDateTime::fromTime_t(callItem->call()->getStartTimeStamp().toUInt()).date());
-         QNumericTreeWidgetItem* item = m_pItemView->addItem<QNumericTreeWidgetItem>(category);
+         QNumericTreeWidgetItem* item = m_pItemView->addItem<QNumericTreeWidgetItem>(category,true);
          item->weight = -callItem->call()->getStopTimeStamp().toUInt();
          item->widget = callItem;
          callItem->setItem(item);