Differential D8493 Diff 23063 containments/desktop/plugins/folder/foldermodel.h

Changeset View

Standalone View

View Options

containments/desktop/plugins/folder/foldermodel.h

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)
51class KFileItemActions; 51​class KFileItemActions;
52class KJob; 52​class KJob;
53class KNewFileMenu; 53​class KNewFileMenu;
54 54​
55namespace KIO { 55​namespace KIO {
56 class DropJob; 56​ class DropJob;
57} 57​}
58 58​
59​class ScreenMapper;
60​
59class DirLister : public KDirLister 61​class DirLister : public KDirLister
60{ 62​{
61 Q_OBJECT 63​ Q_OBJECT
62 64​
63 public: 65​ public:
64 explicit DirLister(QObject *parent = nullptr); 66​ explicit DirLister(QObject *parent = nullptr);
65 ~DirLister(); 67​ ~DirLister();
66 68​
Show All 22 Lines77{
89 Q_PROPERTY(bool parseDesktopFiles READ parseDesktopFiles WRITE setParseDesktopFiles NOTIFY parseDesktopFilesChanged) 91​ Q_PROPERTY(bool parseDesktopFiles READ parseDesktopFiles WRITE setParseDesktopFiles NOTIFY parseDesktopFilesChanged)
90 Q_PROPERTY(QObject* viewAdapter READ viewAdapter WRITE setViewAdapter NOTIFY viewAdapterChanged) 92​ Q_PROPERTY(QObject* viewAdapter READ viewAdapter WRITE setViewAdapter NOTIFY viewAdapterChanged)
91 Q_PROPERTY(bool previews READ previews WRITE setPreviews NOTIFY previewsChanged) 93​ Q_PROPERTY(bool previews READ previews WRITE setPreviews NOTIFY previewsChanged)
92 Q_PROPERTY(QStringList previewPlugins READ previewPlugins WRITE setPreviewPlugins NOTIFY previewPluginsChanged) 94​ Q_PROPERTY(QStringList previewPlugins READ previewPlugins WRITE setPreviewPlugins NOTIFY previewPluginsChanged)
93 Q_PROPERTY(int filterMode READ filterMode WRITE setFilterMode NOTIFY filterModeChanged) 95​ Q_PROPERTY(int filterMode READ filterMode WRITE setFilterMode NOTIFY filterModeChanged)
94 Q_PROPERTY(QString filterPattern READ filterPattern WRITE setFilterPattern NOTIFY filterPatternChanged) 96​ Q_PROPERTY(QString filterPattern READ filterPattern WRITE setFilterPattern NOTIFY filterPatternChanged)
95 Q_PROPERTY(QStringList filterMimeTypes READ filterMimeTypes WRITE setFilterMimeTypes NOTIFY filterMimeTypesChanged) 97​ Q_PROPERTY(QStringList filterMimeTypes READ filterMimeTypes WRITE setFilterMimeTypes NOTIFY filterMimeTypesChanged)
96 Q_PROPERTY(QObject* newMenu READ newMenu CONSTANT) 98​ Q_PROPERTY(QObject* newMenu READ newMenu CONSTANT)
99​ Q_PROPERTY(ScreenMapper* screenMapper READ screenMapper WRITE setScreenMapper NOTIFY screenMapperChanged)
100​ Q_PROPERTY(QObject* appletInterface READ appletInterface WRITE setAppletInterface NOTIFY appletInterfaceChanged);
broulikUnsubmitted
Not Done

You can use ScreenMapper * as property type if you did qmlRegisterType<ScreenMapper>() on it.

Also note that QML engine sucks at resolving namespaces, so you might need to fully qualify it should it be in a namespace.

broulik: You can use `ScreenMapper *` as property type if you did `qmlRegisterType<ScreenMapper>()` on…
97 101​
98 public: 102​ public:
99 enum DataRole { 103​ enum DataRole {
100 BlankRole = Qt::UserRole + 1, 104​ BlankRole = Qt::UserRole + 1,
101 OverlaysRole, 105​ OverlaysRole,
102 SelectedRole, 106​ SelectedRole,
103 IsDirRole, 107​ IsDirRole,
104 IsLinkRole, 108​ IsLinkRole,
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Line(s)
175 void setFilterMode(int filterMode); 179​ void setFilterMode(int filterMode);
176 180​
177 QString filterPattern() const; 181​ QString filterPattern() const;
178 void setFilterPattern(const QString &pattern); 182​ void setFilterPattern(const QString &pattern);
179 183​
180 QStringList filterMimeTypes() const; 184​ QStringList filterMimeTypes() const;
181 void setFilterMimeTypes(const QStringList &mimeList); 185​ void setFilterMimeTypes(const QStringList &mimeList);
182 186​
187​ ScreenMapper* screenMapper() const;
188​ void setScreenMapper(ScreenMapper* screenMapper);
189​
190​ QObject *appletInterface() const;
broulikUnsubmitted
Not Done

Coding style: space before *, ie QObject *foo()

broulik: Coding style: space //before// `*`, ie `QObject *foo()`
mwolffUnsubmitted
Not Done

unused, remove? also, the mapper is now a singleton? so why have it as a member here, too?

mwolff: unused, remove? also, the mapper is now a singleton? so why have it as a member here, too?
191​ void setAppletInterface(QObject *appletInterface);
mlaurentUnsubmitted
Not Done

Coding style "space before *"

mlaurent: Coding style "space before *"
192​
183 KFileItem rootItem() const; 193​ KFileItem rootItem() const;
184 194​
185 Q_INVOKABLE void up(); 195​ Q_INVOKABLE void up();
186 Q_INVOKABLE void cd(int row); 196​ Q_INVOKABLE void cd(int row);
187 197​
188 Q_INVOKABLE void run(int row); 198​ Q_INVOKABLE void run(int row);
189 Q_INVOKABLE void runSelected(); 199​ Q_INVOKABLE void runSelected();
190 200​
Show All 37 Lines
228 Q_INVOKABLE void paste(); 238​ Q_INVOKABLE void paste();
229 Q_INVOKABLE void copy(); 239​ Q_INVOKABLE void copy();
230 Q_INVOKABLE void cut(); 240​ Q_INVOKABLE void cut();
231 Q_INVOKABLE void deleteSelected(); 241​ Q_INVOKABLE void deleteSelected();
232 Q_INVOKABLE void openSelected(); 242​ Q_INVOKABLE void openSelected();
233 Q_INVOKABLE void undo(); 243​ Q_INVOKABLE void undo();
234 Q_INVOKABLE void refresh(); 244​ Q_INVOKABLE void refresh();
235 245​
246​ void setScreen(int screen);
247​
236 Q_SIGNALS: 248​ Q_SIGNALS:
237 void urlChanged() const; 249​ void urlChanged() const;
238 void listingCompleted() const; 250​ void listingCompleted() const;
239 void listingCanceled() const; 251​ void listingCanceled() const;
240 void iconNameChanged() const; 252​ void iconNameChanged() const;
241 void resolvedUrlChanged() const; 253​ void resolvedUrlChanged() const;
242 void statusChanged() const; 254​ void statusChanged() const;
243 void errorStringChanged() const; 255​ void errorStringChanged() const;
244 void draggingChanged() const; 256​ void draggingChanged() const;
245 void usedByContainmentChanged() const; 257​ void usedByContainmentChanged() const;
246 void lockedChanged() const; 258​ void lockedChanged() const;
247 void sortModeChanged() const; 259​ void sortModeChanged() const;
248 void sortDescChanged() const; 260​ void sortDescChanged() const;
249 void sortDirsFirstChanged() const; 261​ void sortDirsFirstChanged() const;
250 void parseDesktopFilesChanged() const; 262​ void parseDesktopFilesChanged() const;
251 void viewAdapterChanged(); 263​ void viewAdapterChanged();
252 void previewsChanged() const; 264​ void previewsChanged() const;
253 void previewPluginsChanged() const; 265​ void previewPluginsChanged() const;
254 void filterModeChanged() const; 266​ void filterModeChanged() const;
255 void filterPatternChanged() const; 267​ void filterPatternChanged() const;
256 void filterMimeTypesChanged() const; 268​ void filterMimeTypesChanged() const;
269​ void screenChanged() const;
270​ void screenMapperChanged() const;
271​ void appletInterfaceChanged() const;
257 void requestRename() const; 272​ void requestRename() const;
258 void move(int x, int y, QList<QUrl> urls); 273​ void move(int x, int y, QList<QUrl> urls);
259 void popupMenuAboutToShow(KIO::DropJob *dropJob, QMimeData *mimeData, int x, int y); 274​ void popupMenuAboutToShow(KIO::DropJob *dropJob, QMimeData *mimeData, int x, int y);
260 275​
261 protected: 276​ protected:
262 bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; 277​ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
263 bool matchMimeType(const KFileItem &item) const; 278​ bool matchMimeType(const KFileItem &item) const;
264 bool matchPattern(const KFileItem &item) const; 279​ bool matchPattern(const KFileItem &item) const;
265 280​
266 private Q_SLOTS: 281​ private Q_SLOTS:
267 void dragSelectedInternal(int x, int y); 282​ void dragSelectedInternal(int x, int y);
268 void dirListFailed(const QString &error); 283​ void dirListFailed(const QString &error);
269 void statResult(KJob *job); 284​ void statResult(KJob *job);
270 void evictFromIsDirCache(const KFileItemList &items); 285​ void evictFromIsDirCache(const KFileItemList &items);
271 void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); 286​ void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
272 void pasteTo(); 287​ void pasteTo();
273 void moveSelectedToTrash(); 288​ void moveSelectedToTrash();
274 void emptyTrashBin(); 289​ void emptyTrashBin();
275 void restoreSelectedFromTrash(); 290​ void restoreSelectedFromTrash();
276 void undoTextChanged(const QString &text); 291​ void undoTextChanged(const QString &text);
277 292​
278 private: 293​ private:
279 struct DragImage { 294​ struct DragImage {
mwolffUnsubmitted
Not Done

ws only, unneeded change, can be unset

mwolff: ws only, unneeded change, can be unset
280 int row; 295​ int row;
281 QRect rect; 296​ QRect rect;
282 QPoint cursorOffset; 297​ QPoint cursorOffset;
283 QImage image; 298​ QImage image;
284 bool blank; 299​ bool blank;
285 }; 300​ };
286 301​
287 void createActions(); 302​ void createActions();
Show All 28 Lines
316 bool m_parseDesktopFiles; 331​ bool m_parseDesktopFiles;
317 bool m_previews; 332​ bool m_previews;
318 QStringList m_previewPlugins; 333​ QStringList m_previewPlugins;
319 FilterMode m_filterMode; 334​ FilterMode m_filterMode;
320 QString m_filterPattern; 335​ QString m_filterPattern;
321 bool m_filterPatternMatchAll; 336​ bool m_filterPatternMatchAll;
322 QSet<QString> m_mimeSet; 337​ QSet<QString> m_mimeSet;
323 QList<QRegExp> m_regExps; 338​ QList<QRegExp> m_regExps;
339​ int m_screen = -1;
340​ ScreenMapper *m_screenMapper = nullptr;
341​ QObject *m_appletInterface = nullptr;
324}; 342​};
325 343​
326#endif 344​#endif