diff --git a/fuel.pro b/fuel.pro index 0beeb47..dc7f317 100644 --- a/fuel.pro +++ b/fuel.pro @@ -67,7 +67,7 @@ SOURCES += src/main.cpp\ src/Fossil.cpp \ src/Workspace.cpp \ src/SearchBox.cpp \ - src/Settings.cpp \ + src/AppSettings.cpp \ src/RemoteDialog.cpp \ src/AboutDialog.cpp @@ -86,7 +86,7 @@ HEADERS += src/MainWindow.h \ src/Fossil.h \ src/Workspace.h \ src/SearchBox.h \ - src/Settings.h \ + src/AppSettings.h \ src/RemoteDialog.h \ src/AboutDialog.h diff --git a/manifest b/manifest index ee68dbe..cf86f10 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Simplified\sWorkspace\sinterface\nRemoved\sWorkspace::setDefaultRemoteUrl\ssince\sFossil::setRemoteUrl\sis\sFossil\sspecific -D 2015-09-14T15:56:27.963 +C Renamed\sSettings.h/.cpp\sto\sAppSettings.h/.cpp +D 2015-09-15T10:10:14.515 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b @@ -38,7 +38,7 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32 -F fuel.pro 13e5a8ca66923cb7b9583296b1427ccb2f75782a +F fuel.pro 3c2c97569ccfc907716fc11369b7db4795e7624e F intl/convert.bat ce14bb3b45b162186a73d1cfa6f2a8e832cdeddc x F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 @@ -214,6 +214,8 @@ F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 F rsrc/resources.qrc a69b05ceb3d614f9aaae3adc2734af8ce3013fa2 F src/AboutDialog.cpp aaa3e614c9aace66531bccc35a3dbf398cb79b7b F src/AboutDialog.h 269f3a0589067c08f19b542e4576b0ef58bc6ec5 +F src/AppSettings.cpp f3c48adeaa6573872fd149deeed72eaef3db4489 w src/Settings.cpp +F src/AppSettings.h 815d90d4a0a7110f836836370c8b7e11422ab528 w src/Settings.h F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/CloneDialog.cpp ca978366d9d5fcdbb21551cd7d7e782fcebd066c @@ -229,21 +231,19 @@ F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/Fossil.cpp a33ea0f0c6ac9af9a50bbb8eb0f00d014d742ae7 F src/Fossil.h 7695ace9412a26c5498a4ebe69ab261f6d598d81 F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac -F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 +F src/FslSettingsDialog.h 92a292d43022289f9f626050cd07392dd72f1676 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 F src/MainWindow.cpp be50d276b0cba6234b1699f92f9f5aa9b9e4fc00 -F src/MainWindow.h fd8bb12f0bf49a6cb5ce9b875ad5277426380e3f +F src/MainWindow.h ae25aef04587cd46aa113397db0de1e776091efe F src/RemoteDialog.cpp 1a57a15465f689057d5354a29ad3015e54582343 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 F src/SearchBox.cpp d4209c575baa9933e1ce5ed376e785b289a145ba F src/SearchBox.h 0c78d3a68136dab3e0e71b83ae36f22bd2688ab2 -F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f -F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055 F src/SettingsDialog.cpp fa0c70eaf0fa7edb15de302d041cdb552fe523d5 -F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd +F src/SettingsDialog.h 81158a26ce9ea9fd95c6c5cdd3c24a9b87b00e8d F src/Utils.cpp fb9fe1caeef47dca310079f8f10b41c838defaa5 F src/Utils.h c52be757cd0045e34ab14c51f35a61af8f8870a4 F src/Workspace.cpp 88ec8258920d7d450c3bb6110085fb07b30ee01a @@ -261,7 +261,7 @@ F ui/MainWindow.ui ad04643d071fe513b46ef413749a493909a90ad1 F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1 -P b29c19caa92280f7378e78f0febb56fc4fec7b03 -R ed37893ba3f997333ca438479bd642f9 +P 3a62c3b4808b76d14fd48839f7aba68e4502c6ad +R 9476eb1cdf40ed4bcce3e28d7b815097 U Kostas -Z ed5d827e4559238ecc2dbcfb924fbdc5 +Z 162321b283d5a79bfa8836ca7d1d368c diff --git a/manifest.uuid b/manifest.uuid index f5c2596..9d1fbff 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3a62c3b4808b76d14fd48839f7aba68e4502c6ad \ No newline at end of file +96924d1d0700cae5f848c9acf40d2775e2f48db1 \ No newline at end of file diff --git a/src/Settings.cpp b/src/AppSettings.cpp similarity index 99% rename from src/Settings.cpp rename to src/AppSettings.cpp index 0f9a652..f3f4489 100644 --- a/src/Settings.cpp +++ b/src/AppSettings.cpp @@ -1,4 +1,4 @@ -#include "Settings.h" +#include "AppSettings.h" #include #include diff --git a/src/Settings.h b/src/AppSettings.h similarity index 97% rename from src/Settings.h rename to src/AppSettings.h index 63b3e41..1bf8811 100644 --- a/src/Settings.h +++ b/src/AppSettings.h @@ -1,5 +1,5 @@ -#ifndef SETTINGS_H -#define SETTINGS_H +#ifndef APPSETTINGS_H +#define APPSETTINGS_H #include #include @@ -123,4 +123,4 @@ private: }; -#endif // SETTINGS_H +#endif // APPSETTINGS_H diff --git a/src/FslSettingsDialog.h b/src/FslSettingsDialog.h index ed71046..f61c35d 100644 --- a/src/FslSettingsDialog.h +++ b/src/FslSettingsDialog.h @@ -2,7 +2,7 @@ #define FSLSETTINGSDIALOG_H #include -#include "Settings.h" +#include "AppSettings.h" namespace Ui { class FslSettingsDialog; diff --git a/src/MainWindow.h b/src/MainWindow.h index 0ee16c4..ccadbca 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -4,7 +4,7 @@ #include #include #include -#include "Settings.h" +#include "AppSettings.h" #include "Workspace.h" namespace Ui { diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h index 3b0fdb7..53d0966 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -2,7 +2,7 @@ #define SETTINGSDIALOG_H #include -#include "Settings.h" +#include "AppSettings.h" namespace Ui { class SettingsDialog;