[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/plugins/reportspgz
From:       Dag Andersen <danders () get2net ! dk>
Date:       2010-02-15 10:29:30
Message-ID: 1266229770.100233.4772.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1090436 by danders:

Use Qt::SortOrder


 M  +1 -1      kexidbreportdata.cpp  
 M  +1 -6      koreport/common/koreportdata.h  
 M  +4 -8      koreport/common/krdetailsectiondata.cpp  
 M  +1 -6      koreport/common/krdetailsectiondata.h  
 M  +6 -6      koreport/wrtembed/reportsectiondetailgroup.cpp  
 M  +3 -9      koreport/wrtembed/reportsectiondetailgroup.h  
 M  +3 -3      koreport/wrtembed/sectioneditor.cpp  


--- trunk/koffice/kexi/plugins/reportspgz/kexidbreportdata.cpp #1090435:1090436
@@ -40,7 +40,7 @@
         
         for ( unsigned int i = 0; i < sl.count(); ++i )
         {
-            order.appendField(*m_schema, sl[i].field, sl[i].order == \
KoReportData::Sort::Ascending); +            order.appendField(*m_schema, \
sl[i].field, sl[i].order == Qt::AscendingOrder);  }
         m_schema->setOrderByColumnList(order);
     }
--- trunk/koffice/kexi/plugins/reportspgz/koreport/common/koreportdata.h \
#1090435:1090436 @@ -31,13 +31,8 @@
     class Sort
     {
         public:
-        enum Order {
-            Ascending = 1,
-            Descending
-        };
-
         QString field;
-        Order order;
+        Qt::SortOrder order;
         //bool group; //probably not required?
     };
     typedef QList<Sort> SortList;
--- trunk/koffice/kexi/plugins/reportspgz/koreport/common/krdetailsectiondata.cpp \
#1090435:1090436 @@ -63,9 +63,9 @@
             }
 
             if (elemThis.attribute("report:group-sort", "ascending") == "ascending") \
                {
-                dgsd->m_sort = ORDetailGroupSectionData::Ascending;
+                dgsd->m_sort = Qt::AscendingOrder;
             } else {
-                dgsd->m_sort = ORDetailGroupSectionData::Descending;
+                dgsd->m_sort = Qt::DescendingOrder;
             }
             
             for ( QDomElement e = elemThis.firstChildElement( "report:section" ); ! \
e.isNull(); e = e.nextSiblingElement( "report:section" ) ) { @@ -89,11 +89,7 @@
             m_groupList.append(dgsd);
             KoReportData::Sort s;
             s.field = dgsd->m_column;
-            if (dgsd->m_sort == ORDetailGroupSectionData::Ascending)
-                s.order = KoReportData::Sort::Ascending;
-            else
-                s.order = KoReportData::Sort::Descending;
-            
+            s.order = dgsd->m_sort;
             m_sortList.append(s);
 	    
         } else if (elemThis.tagName() == "report:section" && \
elemThis.attribute("report:section-type") == "detail") { @@ -118,7 +114,7 @@
 ORDetailGroupSectionData::ORDetailGroupSectionData()
 {
     m_pagebreak = BreakNone;
-    m_sort = Ascending;
+    m_sort = Qt::AscendingOrder;
     m_groupHeader = 0;
     m_groupFooter = 0;
 }
--- trunk/koffice/kexi/plugins/reportspgz/koreport/common/krdetailsectiondata.h \
#1090435:1090436 @@ -69,15 +69,10 @@
         BreakBeforeGroupHeader = 2
     };
 
-    enum Sort {
-        Ascending = 1,
-        Descending
-    };
-    
     //QString name;
     QString m_column;
     PageBreak m_pagebreak;
-    Sort m_sort;
+    Qt::SortOrder m_sort;
 
     KRSectionData *m_groupHeader;
     KRSectionData *m_groupFooter;
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportsectiondetailgroup.cpp \
#1090435:1090436 @@ -35,7 +35,7 @@
     Q_UNUSED(name);
 
     m_pageBreak = BreakNone;
-    m_sort = Ascending;
+    m_sort = Qt::AscendingOrder;
     ReportDesigner * rd = 0;
     m_reportSectionDetail = rsd;
     if (m_reportSectionDetail) {
@@ -70,7 +70,7 @@
         grp.setAttribute("report:group-page-break", "before-header");
     }
 
-    if (m_sort == ReportSectionDetailGroup::Ascending) {
+    if (m_sort == Qt::AscendingOrder) {
         grp.setAttribute("report:group-sort", "ascending");
     }
     else {
@@ -110,10 +110,10 @@
     }
     
     if (element.attribute("report:group-sort", "ascending") == "ascending") {
-        setSort(ReportSectionDetailGroup::Ascending);
+        setSort(Qt::AscendingOrder);
     }
     else {
-        setSort(ReportSectionDetailGroup::Descending);
+        setSort(Qt::DescendingOrder);
     }
     
     for ( QDomElement e = element.firstChildElement( "report:section" ); ! \
e.isNull(); e = e.nextSiblingElement( "report:section" ) ) { @@ -153,12 +153,12 @@
     m_pageBreak = pb;
 }
 
-void ReportSectionDetailGroup::setSort(ReportSectionDetailGroup::Sort s)
+void ReportSectionDetailGroup::setSort(Qt::SortOrder s)
 {
     m_sort = s;
 }
 
-ReportSectionDetailGroup::Sort ReportSectionDetailGroup::sort()
+Qt::SortOrder ReportSectionDetailGroup::sort()
 {
     return m_sort;
 }
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/reportsectiondetailgroup.h \
#1090435:1090436 @@ -44,12 +44,6 @@
         BreakBeforeGroupHeader = 2
     };
 
-    enum Sort {
-        Ascending = 1,
-        Descending
-    };
-    
-
     void setColumn(const QString &);
     QString column() const;
 
@@ -62,8 +56,8 @@
     void setPageBreak(PageBreak);
     PageBreak  pageBreak() const;
 
-    void setSort(Sort);
-    Sort sort();
+    void setSort(Qt::SortOrder);
+    Qt::SortOrder sort();
 
     ReportSection * groupHeader() const;
     ReportSection * groupFooter() const;
@@ -80,7 +74,7 @@
     ReportSectionDetail * m_reportSectionDetail;
 
     PageBreak m_pageBreak;
-    Sort m_sort;
+    Qt::SortOrder m_sort;
 };
 
 
--- trunk/koffice/kexi/plugins/reportspgz/koreport/wrtembed/sectioneditor.cpp \
#1090435:1090436 @@ -283,7 +283,7 @@
         dgsd->cbSort->addItem(i18n("Ascending"), "ascending");
         dgsd->cbSort->addItem(i18n("Descending"), "descending");
 
-        if (rsdg->sort() == ReportSectionDetailGroup::Ascending) {
+        if (rsdg->sort() == Qt::AscendingOrder) {
             dgsd->cbSort->setCurrentIndex(dgsd->cbSort->findData("ascending"));
         }
         else {
@@ -317,10 +317,10 @@
                         rsdg->setPageBreak(ReportSectionDetailGroup::BreakNone);
 
                     if \
                (dgsd->cbSort->itemData(dgsd->cbSort->currentItem()).toString() == \
                "ascending") {
-                        rsdg->setSort(ReportSectionDetailGroup::Ascending);
+                        rsdg->setSort(Qt::AscendingOrder);
                     }
                     else {
-                        rsdg->setSort(ReportSectionDetailGroup::Descending);
+                        rsdg->setSort(Qt::DescendingOrder);
                     }
                     exitLoop = true;
                 }


[prev in list] [next in list] [prev in thread] [next in thread]