Mercurial > octave
diff libgui/src/resource-manager.cc @ 17790:86c6ae5f969e
Use GNU style coding conventions for code in libgui/
* libgui/qterminal/libqterminal/QTerminal.h, libgui/src/color-picker.cc,
libgui/src/color-picker.h, libgui/src/dialog.cc, libgui/src/dialog.h,
libgui/src/documentation-dock-widget.cc, libgui/src/files-dock-widget.cc,
libgui/src/files-dock-widget.h, libgui/src/find-files-dialog.cc,
libgui/src/find-files-dialog.h, libgui/src/find-files-model.cc,
libgui/src/find-files-model.h, libgui/src/history-dock-widget.cc,
libgui/src/history-dock-widget.h, libgui/src/m-editor/file-editor-interface.h,
libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor-tab.h,
libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/find-dialog.cc,
libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/octave-qscintilla.cc,
libgui/src/main-window.cc, libgui/src/main-window.h,
libgui/src/news-dock-widget.h, libgui/src/octave-dock-widget.cc,
libgui/src/octave-dock-widget.h, libgui/src/octave-gui.cc,
libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h,
libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h,
libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h,
libgui/src/resource-manager.cc, libgui/src/settings-dialog.cc,
libgui/src/settings-dialog.h, libgui/src/terminal-dock-widget.cc,
libgui/src/welcome-wizard.cc, libgui/src/workspace-model.cc,
libgui/src/workspace-model.h, libgui/src/workspace-view.cc,
libgui/src/workspace-view.h:
Use GNU style coding conventions for code in libgui/
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 29 Oct 2013 09:54:40 -0700 |
| parents | d63878346099 |
| children | ffdbb82a0c78 |
line wrap: on
line diff
--- a/libgui/src/resource-manager.cc Mon Oct 28 20:49:13 2013 -0700 +++ b/libgui/src/resource-manager.cc Tue Oct 29 09:54:40 2013 -0700 @@ -29,7 +29,7 @@ #include <QFile> #include <QDir> #include <QNetworkProxy> - #include <QLibraryInfo> +#include <QLibraryInfo> #include "error.h" #include "file-ops.h" @@ -89,24 +89,25 @@ { bool loaded; - QString qt_trans_dir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + QString qt_trans_dir + = QLibraryInfo::location (QLibraryInfo::TranslationsPath); QSettings *settings = resource_manager::get_settings (); - // FIXME -- what should happen if settings is 0? + // FIXME: what should happen if settings is 0? // get the locale from the settings QString language = settings->value ("language","SYSTEM").toString (); if (language == "SYSTEM") - language = QLocale::system().name(); // get system wide locale + language = QLocale::system ().name (); // get system wide locale // load the translator file for qt strings - loaded = qt_tr->load("qt_" + language, qt_trans_dir); + loaded = qt_tr->load ("qt_" + language, qt_trans_dir); if (!loaded) // try lower case - qt_tr->load("qt_" + language.toLower (), qt_trans_dir); + qt_tr->load ("qt_" + language.toLower (), qt_trans_dir); // load the translator file for qscintilla settings - loaded = qsci_tr->load("qscintilla_" + language, qt_trans_dir); + loaded = qsci_tr->load ("qscintilla_" + language, qt_trans_dir); if (!loaded) // try lower case - qsci_tr->load("qscintilla_" + language.toLower (), qt_trans_dir); + qsci_tr->load ("qscintilla_" + language.toLower (), qt_trans_dir); // load the translator file for gui strings gui_tr->load (language, get_gui_translation_dir ()); @@ -178,7 +179,7 @@ if (!QFile::exists (settings_file)) { - QDir("/").mkpath (settings_path); + QDir ("/").mkpath (settings_path); QFile::copy (default_qt_settings_file (), settings_file); first_run = true; } @@ -227,7 +228,7 @@ QNetworkProxy::setApplicationProxy (proxy); } -QStringList +QStringList resource_manager::storage_class_names (void) { return workspace_model::storage_class_names (); @@ -239,7 +240,7 @@ return workspace_model::storage_class_default_colors (); } -QStringList +QStringList resource_manager::terminal_color_names (void) { return QTerminal::color_names ();