Differential D8348 Diff 21808 src/filewidgets/kfileplacesitem_p.h

Changeset View

Standalone View

View Options

src/filewidgets/kfileplacesitem_p.h

Show All 27 Lines
28#include <kbookmark.h> 28​#include <kbookmark.h>
29#include <solid/device.h> 29​#include <solid/device.h>
30 30​
31class KDirLister; 31​class KDirLister;
32namespace Solid 32​namespace Solid
33{ 33​{
34class StorageAccess; 34​class StorageAccess;
35class StorageVolume; 35​class StorageVolume;
36​class StorageDrive;
36class OpticalDisc; 37​class OpticalDisc;
37class PortableMediaPlayer; 38​class PortableMediaPlayer;
38} 39​}
39 40​
40class KFilePlacesItem : public QObject 41​class KFilePlacesItem : public QObject
41{ 42​{
42 Q_OBJECT 43​ Q_OBJECT
43public: 44​public:
44 enum GroupType 45​ enum GroupType
45 { 46​ {
46 PlacesType = 0, 47​ PlacesType = 0,
47 RecentlySavedType = 1, 48​ RecentlySavedType = 1,
48 SearchForType = 2, 49​ SearchForType = 2,
49 DevicesType = 3 50​ DevicesType = 3,
51​ RemovableDevicesType = 4
ervinUnsubmitted
Done

RemovableDevicesType (since you used the plural on the one above).

ervin: RemovableDevicesType (since you used the plural on the one above).
50 }; 52​ };
51 53​
52 KFilePlacesItem(KBookmarkManager *manager, 54​ KFilePlacesItem(KBookmarkManager *manager,
53 const QString &address, 55​ const QString &address,
54 const QString &udi = QString()); 56​ const QString &udi = QString());
55 ~KFilePlacesItem(); 57​ ~KFilePlacesItem();
56 58​
57 QString id() const; 59​ QString id() const;
Show All 26 Lines
84 86​
85private: 87​private:
86 QVariant bookmarkData(int role) const; 88​ QVariant bookmarkData(int role) const;
87 QVariant deviceData(int role) const; 89​ QVariant deviceData(int role) const;
88 90​
89 QString iconNameForBookmark(const KBookmark &bookmark) const; 91​ QString iconNameForBookmark(const KBookmark &bookmark) const;
90 92​
91 static QString generateNewId(); 93​ static QString generateNewId();
94​ bool updateDeviceInfo(const QString &udi);
92 95​
93 KBookmarkManager *m_manager; 96​ KBookmarkManager *m_manager;
94 KBookmark m_bookmark; 97​ KBookmark m_bookmark;
95 bool m_folderIsEmpty; 98​ bool m_folderIsEmpty;
96 bool m_isCdrom; 99​ bool m_isCdrom;
97 bool m_isAccessible; 100​ bool m_isAccessible;
98 QString m_text; 101​ QString m_text;
99 mutable Solid::Device m_device; 102​ Solid::Device m_device;
100 mutable QPointer<Solid::StorageAccess> m_access; 103​ QPointer<Solid::StorageAccess> m_access;
101 mutable QPointer<Solid::StorageVolume> m_volume; 104​ QPointer<Solid::StorageVolume> m_volume;
102 mutable QPointer<Solid::OpticalDisc> m_disc; 105​ QPointer<Solid::StorageDrive> m_drive;
103 mutable QPointer<Solid::PortableMediaPlayer> m_mtp; 106​ QPointer<Solid::OpticalDisc> m_disc;
107​ QPointer<Solid::PortableMediaPlayer> m_mtp;
104 QString m_iconPath; 108​ QString m_iconPath;
105 QStringList m_emblems; 109​ QStringList m_emblems;
106 QString m_groupName; 110​ QString m_groupName;
107}; 111​};
108 112​
109#endif 113​#endif