(Cosmetic) settings don't belong to the dialog provider

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 79b682117134a69706462ad4c6ad108c3d4dcd54..1a2b22eada4b4cc46487fd01463ed451f831b6b1 100755 (executable)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -165,65 +165,63 @@ vlc_module_begin();
     set_callbacks( Open, Close );
 
     add_shortcut("qt");
-
-    add_submodule();
-        set_description( "Dialogs provider" );
-        set_capability( "dialogs provider", 51 );
-
-        add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
-                     QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
-            change_integer_list( i_mode_list, psz_mode_list_text, NULL );
-
-        add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
-                  NOTIFICATION_LONGTEXT, false );
-
-        add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
-                  OPACITY_LONGTEXT, false );
-        add_bool( "qt-blingbling", true, NULL, BLING_TEXT,
-                  BLING_TEXT, false );
-
-        add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
-                SYSTRAY_LONGTEXT, false);
-        add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
-                MINIMIZED_LONGTEXT, true);
-        add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
-                  TITLE_LONGTEXT, false );
-        add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
-                  QT_FULLSCREEN_TEXT, false );
-
-        add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
-                COMPLETEVOL_LONGTEXT, true );
-        add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
-                SAVEVOL_TEXT, true );
-        add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
+    add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
+                 QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
+        change_integer_list( i_mode_list, psz_mode_list_text, NULL );
+
+    add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
+              NOTIFICATION_LONGTEXT, false );
+
+    add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
+                          OPACITY_LONGTEXT, false );
+    add_bool( "qt-blingbling", true, NULL, BLING_TEXT, BLING_TEXT, false );
+
+    add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
+              SYSTRAY_LONGTEXT, false);
+    add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
+              MINIMIZED_LONGTEXT, true);
+    add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
+              TITLE_LONGTEXT, false );
+    add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+              QT_FULLSCREEN_TEXT, false );
+
+    add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
+              COMPLETEVOL_LONGTEXT, true );
+    add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
+              SAVEVOL_TEXT, true );
+    add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
                 FILEDIALOG_PATH_TEXT, true );
-            change_autosave();
-            change_internal();
+        change_autosave();
+        change_internal();
 
-        add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
-                RECENTPLAY_TEXT, false );
-        add_string( "qt-recentplay-filter", "xxx|porn", NULL,
+    add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
+              RECENTPLAY_TEXT, false );
+    add_string( "qt-recentplay-filter", "xxx|porn", NULL,
                 RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false );
 
-        add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
-                  ADVANCED_OPTIONS_LONGTEXT, true );
-        add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
-                ADVANCED_PREFS_LONGTEXT, false );
-        add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
-                ERROR_TEXT, false );
+    add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
+              ADVANCED_OPTIONS_LONGTEXT, true );
+    add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
+              ADVANCED_PREFS_LONGTEXT, false );
+    add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
+              ERROR_TEXT, false );
 #ifdef UPDATE_CHECK
-        add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
-                UPDATER_LONGTEXT, false );
-        add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
-                UPDATER_DAYS_TEXT, false );
+    add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
+              UPDATER_LONGTEXT, false );
+    add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
+                 UPDATER_DAYS_TEXT, false );
 #endif
-        add_string( "qt-slider-colours",
+    add_string( "qt-slider-colours",
                 "255;255;255;20;226;20;255;176;15;235;30;20",
                 NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false );
 
-        add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
-                false );
-            change_internal();
+    add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
+              false );
+        change_internal();
+
+    add_submodule();
+        set_description( "Dialogs provider" );
+        set_capability( "dialogs provider", 51 );
 
         set_callbacks( OpenDialogs, Close );