Finished formatting all filed & added braces#1115
Conversation
itsTheFae
left a comment
There was a problem hiding this comment.
This all looks good. I liked the way we had constructors formatted before, it was easier to read the list of defaults. Otherwise I've got no issues with automatic code formatting 😃
I created some conflicts here when I merged the IRC stuff. I have resolved them using the web UI but missed one of the changes and caused a build error.
SlySven
left a comment
There was a problem hiding this comment.
This is too much to digest in one swell foop - I have picked out some things - some highly relevant some probably out-of-scope... 🙁 - OTOH it does regularise a lot of stuff so should make the joins in different authors works less blindingly obvious. 🤣
src/ActionUnit.cpp
Outdated
| QWidget * test = new QWidget; | ||
| pTB->setTitleBarWidget( test ); | ||
| }*/ | ||
| { |
There was a problem hiding this comment.
This is one place where manual intervention is needed to manipulate the commented out code to the newer layout but retain the commenting out - unless there is clearly no need to preserve the commented out code anyhow and it can be removed completely...
| mpHost->mpConsole->mpTopToolBar->layout()->addWidget(pTB); | ||
| break; | ||
| //case 1: | ||
| //mpHost->mpConsole->mpTopToolBar->layout()->addWidget( pTB ); |
There was a problem hiding this comment.
Again the reformatting is breaking the "shape" of the code that is commented out.
src/Host.cpp
Outdated
| , mCommandSeparator(QString(";")) | ||
| , mDisableAutoCompletion(false) | ||
| , mDisplayFont ( QFont("Bitstream Vera Sans Mono", 10, QFont::Normal ) )//, mDisplayFont ( QFont("Bitstream Vera Sans Mono", 10, QFont:://( QFont("Monospace", 10, QFont::Courier) ), mPort ( port ) | ||
| , mDisplayFont(QFont("Bitstream Vera Sans Mono", |
There was a problem hiding this comment.
TBH I do not see much point in saving the comments, which are what is screwing with the code layout here.
| << QStringLiteral( "%1%2" ).arg(_dest, entryInArchive) | ||
| << "!\n Reported error was:" | ||
| << fd.errorString(); | ||
| qDebug() << "Host::installPackage(" << fileName << "," << module << ")\n ERROR opening:" << QStringLiteral("%1%2").arg(_dest, entryInArchive) |
There was a problem hiding this comment.
Does anyone have any thoughts about breaking each element up on its own line - I tended to do that so that if a single element changes it is obvious where (and reduces the change of a long expression disappearing off the screen to the right), BUT it may be a bit less readable if the overall content is not too long...
There was a problem hiding this comment.
Yeah that's that I felt - it became hard to read when it was split over multiple lines.
| bool LuaInterface::validMove(QTreeWidgetItem* p) | ||
| { | ||
| TVar* newParent = varUnit->getWVar(p); | ||
| if (newParent && newParent->getValueType() != LUA_TTABLE) |
There was a problem hiding this comment.
I guess a change to the more succinct:
return !(newParent && newParent->getValueType() != LUA_TTABLE);
is outside of the scope of this PR. 😀
|
|
||
| int zEbene; | ||
| zEbene = mOz; | ||
|
|
||
| float wegBreite = 1/eSize * tx * rSize; |
There was a problem hiding this comment.
DE: wegBreite
EN: path width -> "exit width" (and given the division here the larger the value on the control on the map widget the smaller or rather thinner the line...!)
There was a problem hiding this comment.
Hmm I'll leave it to the German speaker to translate the stuff when they get about to it.
| * mCurrentLineColor.green(), | ||
| * mCurrentLineColor.blue() ); | ||
| */ | ||
| /* |
There was a problem hiding this comment.
Another case where (debug) code that is "carefully" commented out is being slightly mangled. {Note: I tend to use the leading * on each line "C" style comment on blocks of stuff I want left there for the future (and Qt tends to put it in auto-magically as well - which means it shows up on a global search almost as well as a C++ comment.)}
| button->setStyleSheet(css); | ||
|
|
||
| /* | ||
| * CHECK: The other expandToolbar(...) has the following in this position: |
There was a problem hiding this comment.
Seems neither the old or the new form is right - I wonder if it got reformatted (with different settings) in the past?
| execute(); | ||
| pL->clearCaptureGroups(); | ||
| } | ||
| END : { |
There was a problem hiding this comment.
I think this layout is wrong - as the closing brace is out of position on left margin. Perhaps the label should be on a separate line to the code block opening brace?
| @@ -51,529 +51,530 @@ | |||
| // clang-format off | |||
There was a problem hiding this comment.
READ MY LIPS clang-format I TOLD YOU NOT TO TOUCH THIS! 😡 What part of // clang-format off and ClangFormatStyleOptions can you not understand?
There was a problem hiding this comment.
I also used uncrustify on it to add single-line braces for you - so it would be that tool that did the changes. The formatting looks OK though.
There was a problem hiding this comment.
I see the problem - the trailing comments got pushed out. Will fix.
* Finished formatting all filed & added braces
* Removed duplicate clear event handlers call * Revert back to dev version. 3.3 here we go! * Adds saveWindowLayout() call to AutoSaveOnExit processing. * Edbee editor implementation (#985) * Added a frame to edbee so it looks nicer * Got utf8 module to load (#1074) (update packaging!) * Modified tooltip for Save and Save Profile to clearly indicate their keyboard shortcuts * Added: shortcut for delete action in editor (#1084) * shortcut added for delete action * Removed redundant edbee config related code (#1091) * Delete TScriptEditorManager.h * Delete TScriptEditorManager.cpp * BugFix: import some fixes by "Zolder" from Mudlet (Realms of Legends) fork import: some Zoilder fixes from the MudletRL fork: * in TBuffer::translateToPlainText(...): make some MXP related code execute only if Host::mFORCE_MXP_NEGOTIATION_OFF is NOT set as well as another condition. * in TBuffer::wrap(...): change a for(...) {...} loop termination condition be a "<" rather than a "<=" test - which sounds like an "off-by-one" error fix-up. * In TTextEdit:updateScreenView(): revise code that seems to prevent the width of a "main" console being set too small and NOT written to the "parent" Host::mScreenWidth variable - the original modification removed such a restriction completely, but I have just lowered the minimum from 100 to 40 and ensured it is always stored both in the local "main" console and to the parent record in the Host class for that console. * In TTextEdit::drawForeground(...): revise the behaviour *I think* when at the point where a console "split" becomes unnecessary... Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Cut down on the length of some variable names (#1086) * Clarified use of QLatin1String * Adding GCC 5 for C++14 requirement (#1098) * Fixed "reset map colors" button to work (#1049) * Fixed "reset map colors" button to work That's a 5 year old bug out of the way! * Change travis configuration to use installed gcc-5 (#1108) * Change travis configuration to use installed gcc-5 * Fixes #1104 (#1109) Thanks to Rick for his prompt response on this * Fixed typo in GeyserLabel.lua Per #1112 * Fix locale to C Enforce uniform locale so scripts don't get tripped up on number representation differences (. vs ,) * IRC client update of UI and logic (#1072) * Add Communi Model & Util libs * Full refactor of IRC Client code & UI This retains the primary functions of the old IRC client but adds many more new IRC commands by default. The UI is slightly more organized and interactive now. * Adds QPointer to IRC Dialog pointer variable. * Update Lua `sendIrc()` slightly. * Added /msg command, Input History, and updated display colors. Input History stores a total of 8 previously entered commands the user can cycle through using the Up Arrow key. The previously include /msg command has been added again. Colors of some messages have been updated for (relatively) easier distinction of message lines. * Updated channel handling. * Fix CMake builds Things needed to fix CMake builds: - communi CMake builds needed `include_directories` explicitly specified - more MOC calls in communi - more explicit dependencies to MOC files in communi - ircmessageformatter must be compiled into mudlet * IRC3 with more Lua features (#1087) Changes IRC client to run with settings given per-profile, making the IRC client more visible and configurable within Lua. This adds configuration options to the settings window in the "Special Options" tab for configuring an IRC client on the host profile which opens the settings window. See the PR summary comment for details on available Lua functions and IRC Client commands. * Add a Code of Conduct (#1110) * Create CODE_OF_CONDUCT.md * Fix for the QMake warnings caused by the IRC library includes. * Finished formatting all filed & added braces (#1115) * Finished formatting all filed & added braces * Re-enabled map load on profile load (#1118) * Re-enabled map load on profile load - disabling it broke scripts that relied on map data w/o the map open * updated assignments. * Event-based gamepad functionality (#1106) * Add theme switching to code editor (#1095) * Fix more Toolbar & Button bugs (#1080) (#1090) * Fix bugs with Buttons & Toolbars. - Fixed change detection for location, orienation, and CSS data. - Buttons are not rendered unless they are part of a group, Toolbar/Menu. - ToolBars whos locations are changed now hide their previous TToolBar or TEasyButtonBar instance as needed. * Fix Buttons being left behind when parent toolbar is deleted. Also allows TAction to use QPointer<T> * Update old sourceforge page links (#1132) (#1134) * Fixed blank command separator to not separate as people expect * Replaced isTempKey, isTempAlias, etc with isTemporary (#1102) * also pushed isFolder() and setIsFolder() to the parent Tree class * Give meaning to encodings (#1107) * Delete dev_README Deleted outdated dev_README file. It also didn't seem to be used all that often, else people would have raised the fact that it's outdated... * Update travis to use Qt 5.9 for compiling (#1141) * Re-add single QT 5.6 build job Since we want to keep sure that the minimal Qt version is still compilable (currently we need at least 5.6), we add a single job for that version. * Refactor: rename QMake project/sub-project files (#1103) * refactor: rename QMake project/sub-project files It is down right confusing having several project files in the Qt IDE which are all labelled "src" - this commit renames the main project file from "src.pro" to "mudlet.pro" and also renames: * the lua_yajl module from src.pri to lua_yajl.pri * the luazip module from src.pri to luazip.pri it also: * adds a new communi.pri file (see below) I also took the liberty of renaming the project resource file from: * mudlet_alpha.qrc to mudlet.qrc (we are well past the alpha stage now!) and sorting a couple of items into the right order. By creating a local project file 3rdparty/communi/communi.pri it is possible to group the three separate but related communi libraries into one - as it happens the effective content of the new file is identical to that of the communi libraries own libcommuni/src/src.pri but it has some notes on how the portion of the upstream library that we are using was picked out of there; how to identify the effect version and how to (hopefully) recreate things if upstream gets revised in the future! By not using the upstream "src.pri"/"src.pro" files we avoid the confusion of having a generic "src" project in the Mudlet project as a whole and it is clearly identify-able as a file from the Mudlet project rather than the sub-project that it pulls into the whole thing... There is an minor nuisance side-effect in that having the main project src.pro file open in a Qt Creator IDE or stored in a session will get confused when this commit takes effect as the file will disappear from the repository - it will be necessary to close the project and open the new src/mudlet.pro project file (and possibly re-enter the build steps) - OTOH the main project will now be identified as "mudlet" in Creator rather than the previous "src". 😄 Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Removed accidental debug echo left in (#1151) * initialize int nIrcPort with dlgIRC::DefaultHostPort value. (#1153) * Removes false from sendIrc() return, ignores command filtering status (#1154) * Removes false from sendIrc() return, ignores command filtering status (not used). * Remove punctuation from lua messages * Improved layout of IRC preferences (#1152) * Fix get map events (#1120) * Adapt addMapEvent error messages to current standard * Fix getMapEvents() The function now returns a proper indexed table of objects that each describe a map event. * Add missing call to set Editor as editable. (#1159) * Fixed tab indent to be two spaces again * Fixed getComputerEncoding in case no key found It'll now return the original value passed - it's way better than returning the wrong value. * Add linux ci deployment (#1128) * Modify files needed for CI deployment of linux builds * Syntax fix in .travis.yml * tar the CI AppImages as well * Add lua sqlite runtime dependency * Unset LD variable for linuxdeployqt * Bugfix: unset LD_LIBRARY_PATH in every codepath * Test: install appmenu-qt5 for global menus * Revert 781ef97 (Install appmenu-qt5) The issue was that the first AppImage used Qt 5.6.2 instead of Qt 5.9 (which is how 3.2 was built and how it is build now after merging development in) * Remove manager again (#1163) * Improved map load output to be condensed down if it's all successful (#1117) OK! Would be happy to see that in as well for maps that take a while to load (>1s). * Re-enable search highlighting (#1096) * Remove mainwindow statusbar (#1162) * Replaced statustips with tooltips in the mapper menu * Removed statusbar * Tagging 3.3.0 * Initial QTextToSpeech additions * Further TTS additions and bugfixes * Wrapping TTS functions in #ifdefs for QT_TTS_LIB * Missing #ifdefs * More misplaced #ifdef lines for TTS functions * More QT_TTS_LIB ifs * Adding QTextToSpeech to cmake lists * Various TTS updates * Adding GetState to TLuaInterpreter.h * Minor fixes * Tts temporary fixes * Exchanging toLatin1 with toUtf8 * Fix cmake TTS module includesion * Install Qt 5.9 TTS module on linux * Use Qt provided definition for enabled modules We don't need (and possibly don't want) to provide our own definition for when a module is enabled. Let's use the Qt provided definition instead. * Output confirmation messages of enabled Qt modules * Use upper case "Gamepad" in output * ttsClearQueue crash fix * Fix for global speech events * Whitespace replacement * Various minor fixes * More minor fixes. * Cleanup: make CMakeList.txt have uniform indenting and adjust CMake message The minimum versions of the Qt TextToSpeech and Gamepad reported in the CMake project files needed tweaking. I have also tried to regularise the indentation in the Mudlet CMake project files to standardise on 2 spaces. Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Reformat: clean up code-loyout of new TTS TLuaInterpreter code Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * BugFix: fixup a switch() in (int) TLuaInterpreter::ttsGetState(lua_State*) This switch was missing "break;" on all the cases and must have been defective without them - for all but the last case extra strings would have been pushed onto the lua stack but as the return value was 1 they may have been discarded... Signed-off-by: Stephen Lyons <slysven@virginmedia.com> * Enable Qt 5.9 Windows builds for testing * Deploy Qt 5.9 builds for testing * Fixing double-events for queueing purposes * Added missing symbol * Added missing symbol * Updating tts events to globals and adding voice * Create TTSValues.lua * Adding TTSValues to LuaGlobal * Adding TTSValues to Mudlet project * Update CMakeLists.txt * Update TTSValues.lua * Update Qt to 5.10 for trusty This is needed to hopefully have some TTS backend plugins in Linux * Queueing and crash fixes * Renaming tts funcs * Renaming internal functions * Adding functions for retrieving settings * Fixing typo * Making ttsGetState public * Improve error messages for ttsGetCurrentLine() It can be incredibly frustrating to just get a boolean back as an error message when you don't know what is going on * Update error message to be consistent with the new style * Aligned error messages to be consistent with the new style * Fix ttsClearQueue to return nil+error, not actually error on invalid index * Minor code formatting * Floats to doubles * Update documentation links
This covers all of the files we've got, and this is using our already-agreed
.clang-formatstyle so approvals shouldn't take long.Can use the
clang-formathammer on any file we edit now. Just gotta undo the changes where it kills some of the nice formatting we've got in places.Tagging @Mudlet/core-cpp for review.