mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 20:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings

Browse source 
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>
This commit is contained in:
Tomaz Canabrava 2015-10-09 18:11:18 -03:00 • committed by Dirk Hohndel
parent f682a2e6ac
commit c1b2907071
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop-widgets/mainwindow.ui
View file

@ -142,7 +142,6 @@
<string>Share on</string> <string>Share on</string>
</property> </property>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionFacebook"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menu_Edit"/> <addaction name="menu_Edit"/>

3
desktop-widgets/preferences.cpp
View file

@ -142,6 +142,8 @@ void PreferencesDialog::buttonClicked(QAbstractButton *button)
} }
#undef SB #undef SB
#if 0
// TODO: Copy this later.
void PreferencesDialog::on_resetSettings_clicked() void PreferencesDialog::on_resetSettings_clicked()
{ {
QSettings s; QSettings s;
@ -163,6 +165,7 @@ void PreferencesDialog::on_resetSettings_clicked()
close(); close();
} }
} }
#endif
void PreferencesDialog::emitSettingsChanged() void PreferencesDialog::emitSettingsChanged()
{ {

6
desktop-widgets/preferences/preferences_network.h
View file

@ -9,17 +9,19 @@ namespace Ui {
class PreferencesNetwork : public AbstractPreferencesWidget { class PreferencesNetwork : public AbstractPreferencesWidget {
Q_OBJECT Q_OBJECT
public: public:
PreferencesNetwork(); PreferencesNetwork();
virtual ~PreferencesNetwork(); virtual ~PreferencesNetwork();
virtual void refreshSettings(); virtual void refreshSettings();
virtual void syncSettings(); virtual void syncSettings();
public slots:
void proxyType_changed(int i);
private: private:
Ui::PreferencesNetwork *ui; Ui::PreferencesNetwork *ui;
void cloudPinNeeded(); void cloudPinNeeded();
void proxyType_changed(int i);
void passwordUpdateSuccessfull(); void passwordUpdateSuccessfull();
}; };