Mercurial > hg > forks > UniversalIndentGUI
changeset 622:1383cb564ae5
Added some safety belts if an older or wrong uigui ini file is being loaded. Older ini files may have an extra space in the header section name which won't be read with the newer version. So inform the user about that and also avoid some programmatic errors.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@881 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Wed, 29 Oct 2008 16:18:29 +0000 |
| parents | 7e6053006054 |
| children | 993f06e5d9fd |
| files | src/indenthandler.cpp |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indenthandler.cpp Tue Oct 28 22:07:41 2008 +0000 +++ b/src/indenthandler.cpp Wed Oct 29 16:18:29 2008 +0000 @@ -378,6 +378,10 @@ Q_ASSERT_X( !inputFileName.isEmpty(), "callIndenter", "inputFileName is empty" ); // Q_ASSERT_X( !outputFileName.isEmpty(), "callIndenter", "outputFileName is empty" ); Q_ASSERT_X( !indenterFileName.isEmpty(), "callIndenter", "indenterFileName is empty" ); + + if ( indenterFileName.isEmpty() ) { + return ""; + } QString formattedSourceCode; QString indenterCompleteCallString; @@ -827,6 +831,11 @@ cfgFileParameterEnding = "\n"; } indenterShowHelpParameter = indenterSettings->value("header/showHelpParameter").toString(); + + if ( indenterFileName.isEmpty() ) { + errorMessageDialog->showMessage( tr("Indenter ini file header error"), + tr("The loaded indenter ini file \"%1\"has a faulty header. At least the indenters file name is not set.").arg(iniFilePath) ); + } // Read the parameter order. Possible values are (p=parameter[file] i=inputfile o=outputfile) // pio, ipo, iop @@ -1213,6 +1222,10 @@ bool IndentHandler::createIndenterCallString() { QProcess indentProcess; + if ( indenterFileName.isEmpty() ) { + return false; + } + // First try to call the indenter inside of the data dir, using some suffix // ------------------------------------------------------------------------