From 7b087f8f9d94b3758b3dad8d29670cd73d058510 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 6 Dec 2015 21:10:37 +0000 Subject: Facepalm moments - realised gameinfo init call is no longer needed. Removed all references --- src/main.cpp | 4 ---- src/nxmaccessmanager.cpp | 1 - src/profile.h | 4 ---- src/profilesdialog.h | 1 - src/settings.cpp | 1 - 5 files changed, 11 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 353e7202..3469e9c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,7 +35,6 @@ along with Mod Organizer. If not, see . #include #include "modlist.h" #include "profile.h" -#include "gameinfo.h" #include "spawn.h" #include "executableslist.h" #include "singleinstance.h" @@ -569,9 +568,6 @@ int main(int argc, char *argv[]) organizer.setManagedGame(game); - //*sigh just for making it work - GameInfo::init(application.applicationDirPath().toStdWString(), game->gameDirectory().absolutePath().toStdWString()); - organizer.createDefaultProfile(); //See the pragma - we apparently don't use this so not sure why we check it diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp index 7d0dacc2..616b3806 100644 --- a/src/nxmaccessmanager.cpp +++ b/src/nxmaccessmanager.cpp @@ -26,7 +26,6 @@ along with Mod Organizer. If not, see . #include "selfupdater.h" #include "persistentcookiejar.h" #include "settings.h" -#include #include #include #include diff --git a/src/profile.h b/src/profile.h index b306e0c5..e33ac674 100644 --- a/src/profile.h +++ b/src/profile.h @@ -102,10 +102,6 @@ public: /** * @brief activate archive invalidation - * - * @param dataDirectory data directory of the game - * @todo passing the data directory as a parameter is useless, the function should - * be able to query it from GameInfo **/ void activateInvalidation(); diff --git a/src/profilesdialog.h b/src/profilesdialog.h index 26476883..073d92b7 100644 --- a/src/profilesdialog.h +++ b/src/profilesdialog.h @@ -48,7 +48,6 @@ public: * * @param profileName currently enabled profile * @param parent parent widget - * @todo the game path could be retrieved from GameInfo just as easily **/ explicit ProfilesDialog(const QString &profileName, MOBase::IPluginGame const *game, QWidget *parent = 0); ~ProfilesDialog(); diff --git a/src/settings.cpp b/src/settings.cpp index 479dd3ab..d493be1d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -22,7 +22,6 @@ along with Mod Organizer. If not, see . #include "settingsdialog.h" #include "utility.h" #include "helper.h" -#include #include #include #include -- cgit v1.3.1 From a3a4d5441daf16de8c17a1e35857c48307cfa281 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 12 Dec 2015 11:51:05 +0000 Subject: Full details from include what you use for qt creator 'issue' box --- massage_messages.py | 85 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/massage_messages.py b/massage_messages.py index 249068ba..5657f6b4 100644 --- a/massage_messages.py +++ b/massage_messages.py @@ -28,11 +28,14 @@ class QWidget; namespace Ui { class AboutDialog; } // lines 31-31 --- """ + removing = None +includes = dict() -includes = dict +adding = None +added = dict() -foundline = 0 +foundline = None errors = False @@ -45,34 +48,49 @@ def process_next_line(line, outfile): global includes global foundline global errors + global added + global adding line = line.rstrip() print >> outfile, line - if removing: - if line == '': - removing = None - print - return + + if line.endswith(' should remove these lines:'): + adding = None + removing = (line.split(' '))[0] + elif line.endswith(' should add these lines:'): + removing = None + adding = (line.split(' '))[0] + elif line == '' or line.startswith(' the full include-list'): + adding = None + removing = None + elif adding: + m = re.match(r'.*class (.*);', line) + if m: + added[m.group(1)] = (adding, line) else: - # Really we should stash these so that if we get a 'class xxx' in - # the add lines we can print it here. also we could do the case - # fixing. - m = re.match(r'- #include [<"](.*)[">] +// lines (.*)-', line) + added[line] = (adding, line) + elif removing: + # Really we should stash these so that if we get a 'class xxx' in + # the add lines we can print it here. also we could do the case + # fixing. + m = re.match(r'- #include [<"](.*)[">] +// lines (.*)-', line) + if m: + foundline = m.group(2) + print '%s(%s) : warning I0001: Unnecessary include of %s' %\ + (removing, m.group(2), m.group(1)) + if m.group(1) in added: + print ' %s(%s) : note: Use forward reference %s' % ( + removing, m.group(2), added[m.group(1)][1]) + del added[m.group(1)] + else: + m = re.match(r'- (.*) +// lines (.*)-', line) if m: - # If there is an added line with the same class, print it here - print '%s(%s) : warning I0001: Unnecessary include of %s' %\ - (removing, m.group(2), m.group(1)) - foundline = m.group(1) + foundline = m.group(2) + print '%s(%s) : warning I0002: '\ + 'Unnecessary forward ref of %s' %\ + (removing, m.group(2), m.group(1)) else: - m = re.match(r'- (.*) +// lines (.*)-', line) - if m: - print '%s(%s) : warning I0002: '\ - 'Unnecessary forward ref of %s' %\ - (removing, m.group(2), m.group(1)) - foundline = m.group(1) - else: - print '********* I got confused **********' - - if line.startswith('In file included from'): + print '********* I got confused **********' + elif line.startswith('In file included from'): line = re.sub(r'^(In file included from)(.*):(\d+):', r' \2(\3) : \1 here', line) @@ -88,14 +106,6 @@ def process_next_line(line, outfile): errors = True print line - if line.endswith(' should remove these lines:'): - removing = (line.split(' '))[0] - elif line.endswith(' should add these lines:'): - adding = (line.split(' '))[0] - -# also process the other lines - - # added lines should come after the first entry with a line number. outfile = open(sys.argv[1], 'w') process = subprocess.Popen(sys.argv[2:], @@ -107,6 +117,15 @@ while True: if output: process_next_line(output, outfile) +# A note: We should probably do some work as we use the source code line for +# messages in include files... + +if foundline is None: + foundline = '1' +for add in added: + print '%s(%s) : warning I0003: Need to include %s' % ( + added[add][0], foundline, added[add][1]) + rc = process.poll() # The return code you get appears to be more to do with the amount of output # generated than any real error, so instead we should error if any ': error:' -- cgit v1.3.1 From c344714661a2404a54428439f0cf7dbb1573d01f Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 12 Dec 2015 12:35:14 +0000 Subject: And found it was unreadable so ordered things a bit and replaced 2 line 'could use forward reference' with 1 --- massage_messages.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/massage_messages.py b/massage_messages.py index 5657f6b4..d79f4cea 100644 --- a/massage_messages.py +++ b/massage_messages.py @@ -1,3 +1,5 @@ +from collections import defaultdict + import fileinput import re import subprocess @@ -39,6 +41,8 @@ foundline = None errors = False +messages = defaultdict(list) + def process_next_line(line, outfile): """ Read a line of output/error from include-what-you use Turn clang errors into a form QT creator recognises @@ -75,19 +79,23 @@ def process_next_line(line, outfile): m = re.match(r'- #include [<"](.*)[">] +// lines (.*)-', line) if m: foundline = m.group(2) - print '%s(%s) : warning I0001: Unnecessary include of %s' %\ - (removing, m.group(2), m.group(1)) if m.group(1) in added: - print ' %s(%s) : note: Use forward reference %s' % ( - removing, m.group(2), added[m.group(1)][1]) + messages[removing].append( + '%s(%s) : warning I0004: Replace include of %s with ' + 'forward reference %s' % ( + removing, m.group(2), m.group(1), added[m.group(1)][1])) del added[m.group(1)] + else: + messages[removing].append( + '%s(%s) : warning I0001: Unnecessary include of %s' % ( + removing, m.group(2), m.group(1))) + else: m = re.match(r'- (.*) +// lines (.*)-', line) if m: - foundline = m.group(2) - print '%s(%s) : warning I0002: '\ - 'Unnecessary forward ref of %s' %\ - (removing, m.group(2), m.group(1)) + messages[removing].append( + '%s(%s) : warning I0002: Unnecessary forward ref of %s' % ( + removing, m.group(2), m.group(1))) else: print '********* I got confused **********' elif line.startswith('In file included from'): @@ -122,9 +130,15 @@ while True: if foundline is None: foundline = '1' + for add in added: - print '%s(%s) : warning I0003: Need to include %s' % ( - added[add][0], foundline, added[add][1]) + messages[added[add][0]].append( + '%s(%s) : warning I0003: Need to include %s' % ( + added[add][0], foundline, added[add][1])) + +for file in sorted(messages.keys(), reverse = True): + for line in messages[file]: + print line rc = process.poll() # The return code you get appears to be more to do with the amount of output -- cgit v1.3.1