Console: rename PascalCase named methods to camelCase
This commit is contained in:
@@ -186,7 +186,7 @@ void ButtonModel::load3DConnexionButtons(const char *RequiredDeviceName)
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
// We don't mind not finding the file to be opened
|
||||
Base::Console().Warning("%s\n", e.what());
|
||||
Base::Console().warning("%s\n", e.what());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ QVariant ButtonModel::data (const QModelIndex &index, int role) const
|
||||
GroupVector groupVector = spaceballButtonGroup()->GetGroups();
|
||||
if (index.row() >= (int)groupVector.size())
|
||||
{
|
||||
Base::Console().Log("index error in ButtonModel::data\n");
|
||||
Base::Console().log("index error in ButtonModel::data\n");
|
||||
return {};
|
||||
}
|
||||
if (role == Qt::DisplayRole)
|
||||
@@ -913,7 +913,7 @@ QStringList DlgCustomizeSpaceball::getModels()
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
// We don't mind not finding the file to be opened
|
||||
Base::Console().Warning("%s\n", e.what());
|
||||
Base::Console().warning("%s\n", e.what());
|
||||
}
|
||||
|
||||
return modelList;
|
||||
|
||||
@@ -645,7 +645,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto groupBox7 =
|
||||
setupCustomMacrosPage->findChild<QGroupBox*>(QStringLiteral("GroupBox7"));
|
||||
if (!groupBox7) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find groupBox7\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find groupBox7\n");
|
||||
// just warn when not a fatal error
|
||||
}
|
||||
else {
|
||||
@@ -658,7 +658,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto buttonAddAction =
|
||||
setupCustomMacrosPage->findChild<QPushButton*>(QStringLiteral("buttonAddAction"));
|
||||
if (!buttonAddAction) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find buttonAddAction\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find buttonAddAction\n");
|
||||
}
|
||||
else {
|
||||
buttonAddAction->setStyleSheet(QStringLiteral("color:red"));
|
||||
@@ -667,7 +667,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto macroListBox =
|
||||
setupCustomMacrosPage->findChild<QComboBox*>(QStringLiteral("actionMacros"));
|
||||
if (!macroListBox) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find actionMacros combo box\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find actionMacros combo box\n");
|
||||
}
|
||||
else {
|
||||
int macroIndex = macroListBox->findText(fn); // fn is the macro filename
|
||||
@@ -678,7 +678,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto menuText =
|
||||
setupCustomMacrosPage->findChild<QLineEdit*>(QStringLiteral("actionMenu"));
|
||||
if (!menuText) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find actionMenu menuText\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find actionMenu menuText\n");
|
||||
}
|
||||
else {
|
||||
menuText->setText(bareFileName); // user can fill in other fields, e.g. tooltip
|
||||
@@ -714,7 +714,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto moveActionRightButton =
|
||||
setupToolbarPage->findChild<QPushButton*>(QStringLiteral("moveActionRightButton"));
|
||||
if (!moveActionRightButton) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find moveActionRightButton\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find moveActionRightButton\n");
|
||||
}
|
||||
else {
|
||||
moveActionRightButton->setStyleSheet(QStringLiteral("background-color: red"));
|
||||
@@ -728,7 +728,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto workbenchBox =
|
||||
setupToolbarPage->findChild<QComboBox*>(QStringLiteral("workbenchBox"));
|
||||
if (!workbenchBox) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find workbenchBox\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find workbenchBox\n");
|
||||
}
|
||||
else {
|
||||
/** find the Global workbench and select it for the user **/
|
||||
@@ -739,14 +739,14 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
setupToolbarPage->activateWorkbenchBox(globalIdx);
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find Global workbench\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find Global workbench\n");
|
||||
}
|
||||
|
||||
if (!hasCustomToolbar) {
|
||||
auto newButton =
|
||||
setupToolbarPage->findChild<QPushButton*>(QStringLiteral("newButton"));
|
||||
if (!newButton) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find newButton\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find newButton\n");
|
||||
}
|
||||
else {
|
||||
newButton->setStyleSheet(QStringLiteral("color:red"));
|
||||
@@ -760,7 +760,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
|
||||
auto label = setupToolbarPage->findChild<QLabel*>(QStringLiteral("label"));
|
||||
if (!label) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find label\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find label\n");
|
||||
}
|
||||
else {
|
||||
label->setText(instructions2);
|
||||
@@ -770,7 +770,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
/** find Macros category and select it for the user **/
|
||||
auto categoryBox = setupToolbarPage->findChild<QComboBox*>(QStringLiteral("categoryBox"));
|
||||
if (!categoryBox) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find categoryBox\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find categoryBox\n");
|
||||
}
|
||||
else {
|
||||
int macrosIdx = categoryBox->findText(tr("Macros"));
|
||||
@@ -778,7 +778,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
categoryBox->setCurrentIndex(macrosIdx);
|
||||
}
|
||||
else {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find Macros in categoryBox\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find Macros in categoryBox\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -786,7 +786,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto toolbarTreeWidget =
|
||||
setupToolbarPage->findChild<QTreeWidget*>(QStringLiteral("toolbarTreeWidget"));
|
||||
if (!toolbarTreeWidget) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find toolbarTreeWidget\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find toolbarTreeWidget\n");
|
||||
}
|
||||
else {
|
||||
toolbarTreeWidget->expandAll();
|
||||
@@ -799,7 +799,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
|
||||
auto commandTreeWidget =
|
||||
setupToolbarPage->findChild<QTreeWidget*>(QStringLiteral("commandTreeWidget"));
|
||||
if (!commandTreeWidget) {
|
||||
Base::Console().Warning("Toolbar walkthrough: Unable to find commandTreeWidget\n");
|
||||
Base::Console().warning("Toolbar walkthrough: Unable to find commandTreeWidget\n");
|
||||
}
|
||||
else {
|
||||
if (!hasMacroCommand) { // will be the last in the list, the one just created
|
||||
|
||||
@@ -317,8 +317,7 @@ void DlgPreferencesImp::createPageInGroup(PreferencesPageItem *groupItem, const
|
||||
PreferencePage* page = createPreferencePage(pageName, groupItem->data(GroupNameRole).toString().toStdString());
|
||||
|
||||
if (!page) {
|
||||
Base::Console().Warning("%s is not a preference page\n", pageName.c_str());
|
||||
|
||||
Base::Console().warning("%s is not a preference page\n", pageName.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -344,11 +343,11 @@ void DlgPreferencesImp::createPageInGroup(PreferencesPageItem *groupItem, const
|
||||
addSizeHint(page);
|
||||
}
|
||||
catch (const Base::Exception& e) {
|
||||
Base::Console().Error("Base exception thrown for '%s'\n", pageName.c_str());
|
||||
Base::Console().error("Base exception thrown for '%s'\n", pageName.c_str());
|
||||
e.reportException();
|
||||
}
|
||||
catch (const std::exception& e) {
|
||||
Base::Console().Error("C++ exception thrown for '%s' (%s)\n", pageName.c_str(), e.what());
|
||||
Base::Console().error("C++ exception thrown for '%s' (%s)\n", pageName.c_str(), e.what());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ void DlgRevertToBackupConfigImp::accept()
|
||||
{
|
||||
auto items = ui->listWidget->selectedItems();
|
||||
if (items.count() != 1) {
|
||||
Base::Console().Error(tr("No selection in dialog, cannot load backup file").toStdString().c_str());
|
||||
Base::Console().error(tr("No selection in dialog, cannot load backup file").toStdString().c_str());
|
||||
return;
|
||||
}
|
||||
auto item = items[0];
|
||||
@@ -111,7 +111,7 @@ void DlgRevertToBackupConfigImp::accept()
|
||||
newParameters->GetGroup("BaseApp")->copyTo(baseAppGroup);
|
||||
}
|
||||
else {
|
||||
Base::Console().Error("Preference Pack Internal Error: Invalid backup file location");
|
||||
Base::Console().error("Preference Pack Internal Error: Invalid backup file location");
|
||||
}
|
||||
|
||||
QDialog::accept();
|
||||
|
||||
Reference in New Issue
Block a user