Merge branch 'work' into trackhat-ui

* work:
  qfc: double the discrete value count
  shortcuts: sleep less, drop less keystrokes
  accela: revert rot gains to rc15
  ft: try without locking this time
  ft: cleanup comments
  csv: cleanup
  main, ui: fix sort order
  ui: fix close on save

1 files changed, 1 insertions, 1 deletions

diff --git a/csv/csv.h b/csv/csv.h
index 80fbcac4..a896a076 100644
--- a/csv/csv.h
+++ b/csv/csv.h
@@ -14,7 +14,7 @@ public:
     static QStringList parseLine(QString line);
 
     void setCodec(const char* codecName);
-    static void getGameData(const int gameID, unsigned char* table, QString& gamename);
+    static bool getGameData(const int gameID, unsigned char* table, QString& gamename);
 private:
     QIODevice *m_device;
     QTextCodec *m_codec;