Differential D10832 Diff 28017 src/views/versioncontrol/kversioncontrolplugin.h

Changeset View

Standalone View

View Options

src/views/versioncontrol/kversioncontrolplugin.h

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Line(s)
81 * 81​ *
82 * @since 4.8 82​ * @since 4.8
83 */ 83​ */
84class DOLPHINVCS_EXPORT KVersionControlPlugin : public QObject 84​class DOLPHINVCS_EXPORT KVersionControlPlugin : public QObject
85{ 85​{
86 Q_OBJECT 86​ Q_OBJECT
87 87​
88public: 88​public:
89 enum ItemVersion 89​ enum class ItemVersion
90 { 90​ {
91 /** The file is not under version control. */ 91​ /** The file is not under version control. */
92 UnversionedVersion, 92​ Unversioned,
93 /** 93​ /**
94 * The file is under version control and represents 94​ * The file is under version control and represents
95 * the latest version. 95​ * the latest version.
96 */ 96​ */
97 NormalVersion, 97​ Normal,
98 /** 98​ /**
99 * The file is under version control and a newer 99​ * The file is under version control and a newer
100 * version exists on the main branch. 100​ * version exists on the main branch.
101 */ 101​ */
102 UpdateRequiredVersion, 102​ UpdateRequired,
103 /** 103​ /**
104 * The file is under version control and has been 104​ * The file is under version control and has been
105 * modified locally. All modifications will be part 105​ * modified locally. All modifications will be part
106 * of the next commit. 106​ * of the next commit.
107 */ 107​ */
108 LocallyModifiedVersion, 108​ LocallyModified,
109 /** 109​ /**
110 * The file has not been under version control but 110​ * The file has not been under version control but
111 * has been marked to get added with the next commit. 111​ * has been marked to get added with the next commit.
112 */ 112​ */
113 AddedVersion, 113​ Added,
114 /** 114​ /**
115 * The file is under version control but has been marked 115​ * The file is under version control but has been marked
116 * for getting removed with the next commit. 116​ * for getting removed with the next commit.
117 */ 117​ */
118 RemovedVersion, 118​ Removed,
119 /** 119​ /**
120 * The file is under version control and has been locally 120​ * The file is under version control and has been locally
121 * modified. A modification has also been done on the main 121​ * modified. A modification has also been done on the main
122 * branch. 122​ * branch.
123 */ 123​ */
124 ConflictingVersion, 124​ Conflicting,
125 /** 125​ /**
126 * The file is under version control and has local 126​ * The file is under version control and has local
127 * modifications, which will not be part of the next 127​ * modifications, which will not be part of the next
128 * commit (or are "unstaged" in git jargon). 128​ * commit (or are "unstaged" in git jargon).
129 * @since 4.6 129​ * @since 4.6
130 */ 130​ */
131 LocallyModifiedUnstagedVersion, 131​ LocallyModifiedUnstaged,
132 /** 132​ /**
133 * The file is not under version control and is listed 133​ * The file is not under version control and is listed
134 * in the ignore list of the version control system. 134​ * in the ignore list of the version control system.
135 * @since 4.8 135​ * @since 4.8
136 */ 136​ */
137 IgnoredVersion, 137​ Ignored,
138 /** 138​ /**
139 * The file is is tracked by the version control system, but 139​ * The file is is tracked by the version control system, but
140 * is missing in the directory (e.g. by deleted without using 140​ * is missing in the directory (e.g. by deleted without using
141 * a version control command). 141​ * a version control command).
142 * @since 4.8 142​ * @since 4.8
143 */ 143​ */
144 MissingVersion 144​ Missing
145 }; 145​ };
146 146​
147 KVersionControlPlugin(QObject* parent = nullptr); 147​ KVersionControlPlugin(QObject* parent = nullptr);
148 ~KVersionControlPlugin() override; 148​ ~KVersionControlPlugin() override;
149 149​
150 /** 150​ /**
151 * Returns the name of the file which stores 151​ * Returns the name of the file which stores
152 * the version controls information. 152​ * the version controls information.
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines