Diffstat (limited to 'noncore/settings/packagemanager/oconfitem.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oconfitem.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h index aeee511..db77980 100644 --- a/noncore/settings/packagemanager/oconfitem.h +++ b/noncore/settings/packagemanager/oconfitem.h @@ -41,8 +41,7 @@ public: enum Type { Source, Destination, Option, Arch, NotDefined }; - OConfItem( const QString &location = 0x0, Type type = NotDefined, const QString &name = 0x0, - const QString &value = 0x0, bool active = true ); + OConfItem( Type type = NotDefined, const QString &name = 0x0, const QString &value = 0x0, + bool active = true ); - const QString &location() { return m_location; } Type type() { return m_type; } const QString &name() { return m_name; } @@ -50,5 +49,4 @@ public: bool active() { return m_active; } - void setLocation( const QString &location ) { m_location = location; } void setType( Type type ) { m_type = type; } void setName( const QString &name ) { m_name = name; } @@ -57,5 +55,4 @@ public: private: - QString m_location; // Configuration file where item is located Type m_type; // Type of configuration item QString m_name; // Name of item @@ -71,10 +68,4 @@ private: { // Sort by OConfItem location then by type - QString loc1 = reinterpret_cast<OConfItem*>(item1)->location(); - QString loc2 = reinterpret_cast<OConfItem*>(item2)->location(); - if ( loc1 < loc2 ) - return -1; - else if ( loc1 == loc2 ) - { OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); @@ -82,9 +73,15 @@ private: return -1; else if ( type1 == type2 ) + { + QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); + QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); + if ( name1 < name2 ) + return -1; + else if ( name1 == name2 ) return 0; - else /*if ( type1 > type2 )*/ + else /*if ( name1 > name2 )*/ return 1; } - else /*if ( loc1 > loc2 )*/ + else /*if ( type1 > type2 )*/ return 1; } |