diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-10-09 18:11:18 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-30 10:36:51 -0700 |
| commit | c1b2907071432f6a313605950fa95c8eff000a55 (patch) | |
| tree | e74340c430e59a70be3e3f3995104372bf8bed1e | |
| parent | f682a2e6ac85de3542e1904b2396ceb8f3c9d1c9 (diff) | |
| download | subsurface-c1b2907071432f6a313605950fa95c8eff000a55.tar.gz | |
Fix warnings
Also, disable Facebook temporarely since I'm removing the preferences
widget in a few commits. Facebook will have to change to use a new
way of connection that I'm still creating.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/mainwindow.ui | 1 | ||||
| -rw-r--r-- | desktop-widgets/preferences.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/preferences/preferences_network.h | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 5e3200cfc..c62e1df7f 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -142,7 +142,6 @@ <string>Share on</string> </property> <addaction name="separator"/> - <addaction name="actionFacebook"/> </widget> <addaction name="menuFile"/> <addaction name="menu_Edit"/> diff --git a/desktop-widgets/preferences.cpp b/desktop-widgets/preferences.cpp index 2ec9ee96d..29e9d2458 100644 --- a/desktop-widgets/preferences.cpp +++ b/desktop-widgets/preferences.cpp @@ -142,6 +142,8 @@ void PreferencesDialog::buttonClicked(QAbstractButton *button) } #undef SB +#if 0 +// TODO: Copy this later. void PreferencesDialog::on_resetSettings_clicked() { QSettings s; @@ -163,6 +165,7 @@ void PreferencesDialog::on_resetSettings_clicked() close(); } } +#endif void PreferencesDialog::emitSettingsChanged() { diff --git a/desktop-widgets/preferences/preferences_network.h b/desktop-widgets/preferences/preferences_network.h index 8f35adeb0..3e17d51b0 100644 --- a/desktop-widgets/preferences/preferences_network.h +++ b/desktop-widgets/preferences/preferences_network.h @@ -9,17 +9,19 @@ namespace Ui { class PreferencesNetwork : public AbstractPreferencesWidget { Q_OBJECT + public: PreferencesNetwork(); virtual ~PreferencesNetwork(); virtual void refreshSettings(); virtual void syncSettings(); +public slots: + void proxyType_changed(int i); + private: Ui::PreferencesNetwork *ui; - void cloudPinNeeded(); - void proxyType_changed(int i); void passwordUpdateSuccessfull(); }; |