From 0586595de5bbbfd52fddc845dafde38409afe0dd Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 26 Jul 2010 05:47:46 +0200 Subject: [PATCH] Converted public fields of Selector to private. --- src/linkapp.cpp | 4 ++-- src/selector.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/linkapp.cpp b/src/linkapp.cpp index 3f76ed5..9f68854 100644 --- a/src/linkapp.cpp +++ b/src/linkapp.cpp @@ -376,8 +376,8 @@ void LinkApp::selector(int startSelection, const string &selectorDir) { Selector sel(gmenu2x, this, selectorDir); int selection = sel.exec(startSelection); if (selection!=-1) { - gmenu2x->writeTmp(selection,sel.dir); - launch(sel.file, sel.dir); + gmenu2x->writeTmp(selection, sel.getDir()); + launch(sel.getFile(), sel.getDir()); } } diff --git a/src/selector.h b/src/selector.h index 3e9a5df..2bece64 100644 --- a/src/selector.h +++ b/src/selector.h @@ -38,18 +38,21 @@ class Selector : protected Dialog { private: int selRow; LinkApp *link; - + string file, dir; unordered_map aliases; + void loadAliases(); string getAlias(const string &key); void prepare(FileLister *fl, vector *screens, vector *titles); void freeScreenshots(vector *screens); public: - string file, dir; Selector(GMenu2X *gmenu2x, LinkApp *link, const string &selectorDir=""); int exec(int startSelection=0); + + const string &getFile() { return file; } + const string &getDir() { return dir; } }; #endif /*SELECTOR_H_*/