matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring: Move gzip/diff/awk path default values init on Windows into the Preferences class

Browse Source
This commit is contained in:
Srivats P. 2015-04-16 22:30:18 +05:30
parent a9da643fb2
commit fd22d49ead
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/main.cpp
View File

@ -38,23 +38,11 @@ extern ProtocolWidgetFactory *OstProtocolWidgetFactory;
QSettings *appSettings; QSettings *appSettings;
QMainWindow *mainWindow; QMainWindow *mainWindow;
#if defined(Q_OS_WIN32)
QString kGzipPathDefaultValue;
QString kDiffPathDefaultValue;
QString kAwkPathDefaultValue;
#endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
int exitCode; int exitCode;
#if defined(Q_OS_WIN32)
kGzipPathDefaultValue = app.applicationDirPath() + "/gzip.exe";
kDiffPathDefaultValue = app.applicationDirPath() + "/diff.exe";
kAwkPathDefaultValue = app.applicationDirPath() + "/gawk.exe";
#endif
app.setApplicationName("Ostinato"); app.setApplicationName("Ostinato");
app.setOrganizationName("Ostinato"); app.setOrganizationName("Ostinato");
app.setProperty("version", version); app.setProperty("version", version);

15
client/preferences.cpp
View File

@ -25,6 +25,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
#include <QFileDialog> #include <QFileDialog>
#include <QtGlobal> #include <QtGlobal>
#if defined(Q_OS_WIN32)
QString kGzipPathDefaultValue;
QString kDiffPathDefaultValue;
QString kAwkPathDefaultValue;
#endif
QString kUserDefaultValue; QString kUserDefaultValue;
Preferences::Preferences() Preferences::Preferences()
@ -53,9 +59,14 @@ Preferences::~Preferences()
void Preferences::initDefaults() void Preferences::initDefaults()
{ {
Q_ASSERT(appSettings);
// Read username from the environment #if defined(Q_OS_WIN32)
kGzipPathDefaultValue = QApplication::applicationDirPath() + "/gzip.exe";
kDiffPathDefaultValue = QApplication::applicationDirPath() + "/diff.exe";
kAwkPathDefaultValue = QApplication::applicationDirPath() + "/gawk.exe";
#endif
// Read default username from the environment
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
kUserDefaultValue = QString(qgetenv("USERNAME").constData()); kUserDefaultValue = QString(qgetenv("USERNAME").constData());
#else #else